diff options
| author | Maged Elaasar | 2015-12-10 19:26:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-03-22 13:45:02 +0000 |
| commit | e8484696ad8258ca27ca5c622d037c975161ac6b (patch) | |
| tree | 1640f5e2f80a242ecbc61b2a47fb0fc7fee8873c /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile | |
| parent | ac3e24920a8de354a1668d76d59dd549fda9306e (diff) | |
| download | org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.tar.gz org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.tar.xz org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.zip | |
Bug 489116 - Unify diagram visualID of all diagrams in Papyrus
1. Changed the visual ids of the UML2 diagrams from numbers to
meaningful names corresponding to notational cases. This was applied
consistely across diagram such that similar cases get similar visual
ids. Added diagram reconcilers for v1.2 to migrate older diagrams.
2. Amalgamated the UML2 diagram element types into a single model
(umldi.elementtypesconfigurations). Some diagrams, like Sequence,
Communication and Timing, still use extension-based configurations and
will need to be migrated later.
Change-Id: I7f47b25454dcd1ed81e8f3eeffc1a09a2584d316
Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile')
165 files changed, 14277 insertions, 10943 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationDiamondViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationDiamondViewCreateCommand.java index a957a9976b2..a95066ba677 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationDiamondViewCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationDiamondViewCreateCommand.java @@ -108,7 +108,7 @@ public class AssociationDiamondViewCreateCommand extends AbstractTransactionalCo // ((IHintedType) UMLElementTypes.Dependency_2014)
// .getSemanticHint(), -1, true, preferenceHint);
UMLViewProvider viewProvider = new UMLViewProvider();
- node = viewProvider.createAssociation_2015(((EObject) semanticApdater.getAdapter(EObject.class)), this.containerView, -1, true, preferenceHint);
+ node = viewProvider.createAssociation_Shape(((EObject) semanticApdater.getAdapter(EObject.class)), this.containerView, -1, true, preferenceHint);
// put to the good position
Location notationLocation = NotationFactory.eINSTANCE.createLocation();
notationLocation.setX(location.x);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyDiamondViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyDiamondViewCreateCommand.java index d1a53cc300e..f63e4d3bf1f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyDiamondViewCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyDiamondViewCreateCommand.java @@ -114,7 +114,7 @@ public class DependencyDiamondViewCreateCommand extends AbstractTransactionalCom // ((IHintedType) UMLElementTypes.Dependency_2014)
// .getSemanticHint(), -1, true, preferenceHint);
UMLViewProvider viewProvider = new UMLViewProvider();
- node = viewProvider.createDependency_2014(((EObject) semanticApdater.getAdapter(EObject.class)), this.containerView, -1, true, preferenceHint);
+ node = viewProvider.createDependency_Shape(((EObject) semanticApdater.getAdapter(EObject.class)), this.containerView, -1, true, preferenceHint);
// put to the good position
Location notationLocation = NotationFactory.eINSTANCE.createLocation();
notationLocation.setX(location.x);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/PropertyCommandForAssociation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/PropertyCommandForAssociation.java index 2f02cc6c784..6cb12cadcc9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/PropertyCommandForAssociation.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/PropertyCommandForAssociation.java @@ -58,7 +58,7 @@ public class PropertyCommandForAssociation extends ClassPropertyCreateCommand { newElement.setName(((Type) type).getName());
}
owner.getOwnedEnds().add(newElement);
- ElementInitializers.getInstance().init_Property_3002(newElement);
+ ElementInitializers.getInstance().init_Property_ClassAttributeLabel(newElement);
if (type != null && type instanceof Type) {
newElement.setName(((Type) type).getName());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomConstraintEditPart.java index 1df9d6a8179..8431bc3f99f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomConstraintEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomConstraintEditPart.java @@ -29,6 +29,6 @@ public class CustomConstraintEditPart extends ConstraintEditPart { @Override
protected IElementType elementTypeOfToolAfterCreation() {
- return UMLElementTypes.ConstraintContext_8500;
+ return UMLElementTypes.Constraint_ContextEdge;
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomConstraintEditPartCN.java index 1b1495ad1c7..4686a2864c4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomConstraintEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomConstraintEditPartCN.java @@ -29,6 +29,6 @@ public class CustomConstraintEditPartCN extends ConstraintEditPartCN { @Override
protected IElementType elementTypeOfToolAfterCreation() {
- return UMLElementTypes.ConstraintContext_8500;
+ return UMLElementTypes.Constraint_ContextEdge;
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomUMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomUMLDiagramUpdater.java index 718e69fd10c..0272b370165 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomUMLDiagramUpdater.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomUMLDiagramUpdater.java @@ -28,7 +28,7 @@ public class CustomUMLDiagramUpdater extends UMLDiagramUpdater { }
@Override
- protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_4001(Package container) {
+ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_Edge(Package container) {
LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
EObject linkObject = (EObject) links.next();
@@ -51,29 +51,29 @@ public class CustomUMLDiagramUpdater extends UMLDiagramUpdater { if (false == source instanceof Type) {
continue;
}
- result.add(new UMLLinkDescriptor((Type) source, (Type) target, link, UMLElementTypes.Association_4001, AssociationEditPart.VISUAL_ID));
+ result.add(new UMLLinkDescriptor((Type) source, (Type) target, link, UMLElementTypes.Association_Edge, AssociationEditPart.VISUAL_ID));
}
return result;
}
@Override
- protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_4001(Type target, CrossReferenceAdapter crossReferencer) {
- return new TypeModelFacetLinksRetriever_Association_4001(target).getTypeModelFacetLinks_Association_4001();
+ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_Edge(Type target, CrossReferenceAdapter crossReferencer) {
+ return new TypeModelFacetLinksRetriever_Association_Edge(target).getTypeModelFacetLinks_Association_Edge();
}
@Override
- protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_4001(Type source) {
- return new TypeModelFacetLinksRetriever_Association_4001(source).getTypeModelFacetLinks_Association_4001();
+ protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_Edge(Type source) {
+ return new TypeModelFacetLinksRetriever_Association_Edge(source).getTypeModelFacetLinks_Association_Edge();
}
- private static class TypeModelFacetLinksRetriever_Association_4001 {
+ private static class TypeModelFacetLinksRetriever_Association_Edge {
private final Type myRoot;
- public TypeModelFacetLinksRetriever_Association_4001(Type root) {
+ public TypeModelFacetLinksRetriever_Association_Edge(Type root) {
myRoot = root;
}
- public Collection<UMLLinkDescriptor> getTypeModelFacetLinks_Association_4001() {
+ public Collection<UMLLinkDescriptor> getTypeModelFacetLinks_Association_Edge() {
Package container = null;
// Find container element for the link.
// Climb up by containment hierarchy starting from the source
@@ -111,7 +111,7 @@ public class CustomUMLDiagramUpdater extends UMLDiagramUpdater { if (false == source instanceof Type) {
continue;
}
- result.add(new UMLLinkDescriptor((Type) source, (Type) target, link, UMLElementTypes.Association_4001, AssociationEditPart.VISUAL_ID));
+ result.add(new UMLLinkDescriptor((Type) source, (Type) target, link, UMLElementTypes.Association_Edge, AssociationEditPart.VISUAL_ID));
}
return result;
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiAssociationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiAssociationHelper.java index f86c2e5b817..2da4d52019f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiAssociationHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiAssociationHelper.java @@ -152,11 +152,11 @@ public class MultiAssociationHelper extends ElementHelper { }
}
// descriptor for the branch
- ConnectionViewDescriptor viewBranchDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_4019, ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(),
+ ConnectionViewDescriptor viewBranchDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_BranchEdge, ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(),
((IGraphicalEditPart) associationNodeEditPart).getDiagramPreferencesHint());
// the editpart exist -> only creation of the branch
if (sourceEditPart != null) {
- CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), new SemanticAdapter(null,
+ CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), new SemanticAdapter(null,
associationNodeEditPart.getModel()), new SemanticAdapter(null, sourceEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewBranchDescriptor, null);
aBranchCommand.setElement(association);
((CompoundCommand) command).add(new ICommandProxy(aBranchCommand));
@@ -171,7 +171,7 @@ public class MultiAssociationHelper extends ElementHelper { "move", (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), new Point(associationNodeEditPart.getLocation().x + 200, associationNodeEditPart.getLocation().y + index * 100)); //$NON-NLS-1$
((CompoundCommand) command).add(new ICommandProxy(setBoundsCommand));
// Creation of the branch
- CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), new SemanticAdapter(null,
+ CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), new SemanticAdapter(null,
associationNodeEditPart.getModel()), (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), associationNodeEditPart.getViewer(), ((IGraphicalEditPart) associationNodeEditPart).getDiagramPreferencesHint(),
viewBranchDescriptor, null);
aBranchCommand.setElement(association);
@@ -232,10 +232,10 @@ public class MultiAssociationHelper extends ElementHelper { }
}
// descriptor for the branch
- ConnectionViewDescriptor viewBranchDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_4019, ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), diagramPreferencesHint);
+ ConnectionViewDescriptor viewBranchDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_BranchEdge, ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), diagramPreferencesHint);
// the editpart exist -> only creation of the branch
if (sourceEditPart != null) {
- CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult()
+ CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult()
.getReturnValue(), new SemanticAdapter(null, sourceEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewBranchDescriptor, null);
aBranchCommand.setElement(association);
((CompoundCommand) command).add(new ICommandProxy(aBranchCommand));
@@ -249,7 +249,7 @@ public class MultiAssociationHelper extends ElementHelper { SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move", (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), new Point(location.x + 200, location.y + index * 100)); //$NON-NLS-1$
((CompoundCommand) command).add(new ICommandProxy(setBoundsCommand));
// Creation of the branch
- CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult()
+ CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult()
.getReturnValue(), (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), viewer, diagramPreferencesHint, viewBranchDescriptor, null);
aBranchCommand.setElement(association);
((CompoundCommand) command).add(new ICommandProxy(aBranchCommand));
@@ -350,7 +350,7 @@ public class MultiAssociationHelper extends ElementHelper { // ---------------------------------------------------------
// 3. set a new end association in the UML model
// 3.1 creation of the property
- CreateElementRequest request = new CreateElementRequest(getEditingDomain(), association, UMLElementTypes.Property_3002, UMLPackage.eINSTANCE.getAssociation_OwnedEnd());
+ CreateElementRequest request = new CreateElementRequest(getEditingDomain(), association, UMLElementTypes.Property_ClassAttributeLabel, UMLPackage.eINSTANCE.getAssociation_OwnedEnd());
request.setParameter("type", newSemanticElement); //$NON-NLS-1$
EditElementCommand propertyCreateCommand = new PropertyCommandForAssociation(request, DiagramUtils.getDiagramFrom(sourceEditPart));
propertyCreateCommand.setReuseParentTransaction(true);
@@ -364,14 +364,14 @@ public class MultiAssociationHelper extends ElementHelper { ((CompoundCommand) command).add(new ICommandProxy(nodeCreation));
// 4. reconstruction of the old link by taking in account the old
// connection
- ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_4019, ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint());
+ ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_BranchEdge, ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint());
// 5. reconstruction of the first branch between old source to node
- ICommand firstBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(
+ ICommand firstBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(
null, associationViewSource), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
((CustomDeferredCreateConnectionViewCommand) firstBranchCommand).setElement(association);
((CompoundCommand) command).add(new ICommandProxy(firstBranchCommand));
// 6. reconstruction of the second branch between node to old target
- ICommand secondBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(),
+ ICommand secondBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(),
new SemanticAdapter(null, associationViewTarget), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
((CustomDeferredCreateConnectionViewCommand) secondBranchCommand).setElement(association);
((CompoundCommand) command).add(new ICommandProxy(secondBranchCommand));
@@ -379,11 +379,11 @@ public class MultiAssociationHelper extends ElementHelper { ICommand thirdBranchCommand = null;
if (associationView.equals((sourceEditPart.getModel()))) {
// third branch node and target
- thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null,
+ thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null,
targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
} else {
// // third branch source and node
- thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()), (IAdaptable) nodeCreation
+ thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()), (IAdaptable) nodeCreation
.getCommandResult().getReturnValue(), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
}
((CustomDeferredCreateConnectionViewCommand) thirdBranchCommand).setElement(association);
@@ -425,14 +425,14 @@ public class MultiAssociationHelper extends ElementHelper { }
// System.err.println("step init, can execute?" + command.canExecute());
// 0. add semantic
- CreateElementRequest request = new CreateElementRequest(getEditingDomain(), association, UMLElementTypes.Property_3002, UMLPackage.eINSTANCE.getAssociation_OwnedEnd());
+ CreateElementRequest request = new CreateElementRequest(getEditingDomain(), association, UMLElementTypes.Property_ClassAttributeLabel, UMLPackage.eINSTANCE.getAssociation_OwnedEnd());
request.setParameter("type", newSemanticElement); //$NON-NLS-1$
EditElementCommand propertyCreateCommand = new PropertyCommandForAssociation(request, DiagramUtils.getDiagramFrom(sourceEditPart));
((CompoundCommand) command).add(new ICommandProxy(propertyCreateCommand));
// System.err.println("0. add semantic, can execute?" + command.canExecute());
// 1. add the branch graphically
- ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_4019, ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint());
- CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_4019).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()),
+ ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_BranchEdge, ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint());
+ CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()),
new SemanticAdapter(null, targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
aBranchCommand.setElement(association);
((CompoundCommand) command).add(new ICommandProxy(aBranchCommand));
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiDependencyHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiDependencyHelper.java index 1d792d970b7..5b12c1d3f9b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiDependencyHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiDependencyHelper.java @@ -105,15 +105,15 @@ public class MultiDependencyHelper extends ElementHelper { }
}
// descriptor for the branch
- ConnectionViewDescriptor viewBranchDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_4018, ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), diagramPreferencesHint);
+ ConnectionViewDescriptor viewBranchDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_BranchEdge, ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), diagramPreferencesHint);
// the editpart exist -> only creation of the branch
if (sourceEditPart != null) {
CustomDeferredCreateConnectionViewCommand aBranchCommand = null;
if (constructSource) {
- aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()), (IAdaptable) nodeCreation
+ aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()), (IAdaptable) nodeCreation
.getCommandResult().getReturnValue(), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewBranchDescriptor, null);
} else {
- aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null,
+ aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null,
sourceEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewBranchDescriptor, null);
}
aBranchCommand.setElement(dependency);
@@ -130,10 +130,10 @@ public class MultiDependencyHelper extends ElementHelper { // Creation of the branch
CustomDeferredCreateConnectionViewCommand aBranchCommand = null;
if (constructSource) {
- aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(),
+ aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(),
(IAdaptable) nodeCreation.getCommandResult().getReturnValue(), viewer, diagramPreferencesHint, viewBranchDescriptor, null);
} else {
- aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(),
+ aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(),
(IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), viewer, diagramPreferencesHint, viewBranchDescriptor, null);
}
aBranchCommand.setElement(dependency);
@@ -186,8 +186,8 @@ public class MultiDependencyHelper extends ElementHelper { feature = UMLPackage.eINSTANCE.getDependency_Client();
}
// 0. add the branch graphically
- ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_4018, ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint());
- CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()),
+ ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_BranchEdge, ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint());
+ CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()),
new SemanticAdapter(null, targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
aBranchCommand.setElement(dependency);
command = new CompoundCommand();
@@ -338,14 +338,14 @@ public class MultiDependencyHelper extends ElementHelper { // ---------------------------------------------------------
// 4. reconstruction of the old link by taking in account the old
// connection
- ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_4018, ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint());
+ ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_BranchEdge, ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint());
// 5. reconstruction of the first branch between old source to node
- ICommand firstBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), new SemanticAdapter(null, dependencyViewSource), (IAdaptable) nodeCreation
+ ICommand firstBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), new SemanticAdapter(null, dependencyViewSource), (IAdaptable) nodeCreation
.getCommandResult().getReturnValue(), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
((CustomDeferredCreateConnectionViewCommand) firstBranchCommand).setElement(dependency);
((CompoundCommand) command).add(new ICommandProxy(firstBranchCommand));
// 6. reconstruction of the second branch between node to old target
- ICommand secondBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(
+ ICommand secondBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(
null, dependencyViewTarget), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
((CustomDeferredCreateConnectionViewCommand) secondBranchCommand).setElement(dependency);
((CompoundCommand) command).add(new ICommandProxy(secondBranchCommand));
@@ -353,11 +353,11 @@ public class MultiDependencyHelper extends ElementHelper { ICommand thirdBranchCommand = null;
if (dependencyView.equals((sourceEditPart.getModel()))) {
// third branch node and target
- thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null,
+ thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null,
targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
} else {
// // third branch source and node
- thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_4018).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()), (IAdaptable) nodeCreation
+ thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()), (IAdaptable) nodeCreation
.getCommandResult().getReturnValue(), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null);
}
((CustomDeferredCreateConnectionViewCommand) thirdBranchCommand).setElement(dependency);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/migration/ProfileReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/migration/ProfileReconciler_1_2_0.java new file mode 100644 index 00000000000..9ba3aa2c03b --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/migration/ProfileReconciler_1_2_0.java @@ -0,0 +1,304 @@ +/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST and others.
+ *
+ * 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:
+ * Florian Noyrit (CEA) florian.noyrit@cea.fr - Initial API and Implementation
+ * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - reconciler to add floating label
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.profile.custom.migration;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
+
+/**
+ * Profile Diagram Reconciler from 1.1.0 to 1.2.0
+ */
+public class ProfileReconciler_1_2_0 extends DiagramReconciler {
+
+ @Override
+ public ICommand getReconcileCommand(Diagram diagram) {
+ CompositeCommand cc = new CompositeCommand("Migrate diagram from 1.1.0 to 1.2.0");
+ cc.add(new ChangeVisualIDsCommand(diagram));
+ return cc;
+ }
+
+ protected class ChangeVisualIDsCommand extends AbstractCommand {
+
+ protected final Diagram diagram;
+
+ public ChangeVisualIDsCommand(Diagram diagram) {
+ super("Change the diagram's visual ids from 1.1.0 to 1.2.0");
+ this.diagram = diagram;
+ }
+
+ @Override
+ protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+ TreeIterator<EObject> allContentIterator = diagram.eAllContents();
+
+ while (allContentIterator.hasNext()) {
+ EObject eObject = allContentIterator.next();
+ if (eObject instanceof View) {
+ View view = (View) eObject;
+ view.setType(getNewVisualID(view.getType()));
+ }
+ }
+
+ return CommandResult.newOKCommandResult();
+ }
+
+ @Override
+ public boolean canUndo() {
+ return false;
+ }
+
+ @Override
+ public boolean canRedo() {
+ return false;
+ }
+
+ @Override
+ protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+ throw new ExecutionException("Should not be called, canRedo false");
+ }
+
+ @Override
+ protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+ throw new ExecutionException("Should not be called, canUndo false");
+ }
+ }
+
+ public static String getNewVisualID(String oldVisualID) {
+ switch (oldVisualID) {
+ case "1000":
+ return "Profile_ProfileDiagram";
+ case "3026":
+ return "PrimitiveType_Shape_CN";
+ case "5058":
+ return "PrimitiveType_NameLabel_CN";
+ case "3019":
+ return "Operation_DataTypeOperationLabel";
+ case "1037":
+ return "EnumerationLiteral_LiteralLabel";
+ case "3018":
+ return "Property_DataTypeAttributeLabel";
+ case "3002":
+ return "Property_ClassAttributeLabel";
+ case "3020":
+ return "Operation_ClassOperationLabel";
+ case "1023":
+ return "Stereotype_Shape_CN";
+ case "1046":
+ return "Stereotype_NameLabel_CN";
+ case "3010":
+ return "Class_Shape_CN";
+ case "5014":
+ return "Class_NameLabel_CN";
+ case "3028":
+ return "Class_MetaclassShape_CN";
+ case "5062":
+ return "Class_MetaclassNameLabel_CN";
+ case "1007":
+ return "Comment_Shape_CN";
+ case "1008":
+ return "Comment_BodyLabel_CN";
+ case "1027":
+ return "Model_Shape_CN";
+ case "1056":
+ return "Model_NameLabel_CN";
+ case "1024":
+ return "Profile_Shape_CN";
+ case "1050":
+ return "Profile_NameLabel_CN";
+ case "1012":
+ return "Package_Shape_CN";
+ case "1010":
+ return "Package_NameLabel_CN";
+ case "1028":
+ return "Constraint_PackagedElementShape_CN";
+ case "1059":
+ return "Constraint_NameLabel_CN";
+ case "5064":
+ return "Constraint_BodyLabel_CN";
+ case "3025":
+ return "Enumeration_Shape_CN";
+ case "5055":
+ return "Enumeration_NameLabel_CN";
+ case "3027":
+ return "DataType_Shape_CN";
+ case "5061":
+ return "DataType_NameLabel_CN";
+ case "2014":
+ return "Dependency_Shape";
+ case "1":
+ return "Dependency_MultiNameLabel";
+ case "2015":
+ return "Association_Shape";
+ case "1026":
+ return "Stereotype_Shape";
+ case "1034":
+ return "Stereotype_NameLabel";
+ case "2008":
+ return "Class_Shape";
+ case "5029":
+ return "Class_NameLabel";
+ case "1031":
+ return "Class_MetaclassShape";
+ case "1084":
+ return "Class_MetaclassNameLabel";
+ case "1002":
+ return "Comment_Shape";
+ case "3":
+ return "Comment_BodyLabel";
+ case "1014":
+ return "Constraint_PackagedElementShape";
+ case "1015":
+ return "Constraint_NameLabel";
+ case "5063":
+ return "Constraint_BodyLabel";
+ case "2005":
+ return "Model_Shape";
+ case "5020":
+ return "Model_NameLabel";
+ case "1030":
+ return "Profile_Shape";
+ case "1047":
+ return "Profile_NameLabel";
+ case "2007":
+ return "Package_Shape";
+ case "5026":
+ return "Package_NameLabel";
+ case "2006":
+ return "Enumeration_Shape";
+ case "5023":
+ return "Enumeration_NameLabel";
+ case "2009":
+ return "PrimitiveType_Shape";
+ case "5032":
+ return "PrimitiveType_NameLabel";
+ case "2010":
+ return "DataType_Shape";
+ case "5035":
+ return "DataType_NameLabel";
+ case "2016":
+ return "Diagram_ShortcutShape";
+ case "2":
+ return "Diagram_NameLabel";
+ case "1013":
+ return "Extension_Edge";
+ case "4001":
+ return "Association_Edge";
+ case "6001":
+ return "Association_StereotypeLabel";
+ case "6002":
+ return "Association_NameLabel";
+ case "6003":
+ return "Association_TargetRoleLabel";
+ case "6005":
+ return "Association_SourceRoleLabel";
+ case "6033":
+ return "Association_SourceMultiplicityLabel";
+ case "6034":
+ return "Association_TargetMultiplicityLabel";
+ case "1045":
+ return "ProfileApplication_Edge";
+ case "4019":
+ return "Association_BranchEdge";
+ case "6024":
+ return "Association_BranchRoleLabel";
+ case "6035":
+ return "Association_BranchMultiplicityLabel";
+ case "4002":
+ return "Generalization_Edge";
+ case "6007":
+ return "Generalization_StereotypeLabel";
+ case "4008":
+ return "Dependency_Edge";
+ case "6026":
+ return "Dependency_NameLabel";
+ case "6027":
+ return "Dependency_StereotypeLabel";
+ case "4018":
+ return "Dependency_BranchEdge";
+ case "1064":
+ return "ElementImport_Edge";
+ case "6020":
+ return "ElementImport_AliasLabel";
+ case "6021":
+ return "ElementImport_StereotypeLabel";
+ case "1065":
+ return "PackageImport_Edge";
+ case "6022":
+ return "PackageImport_StereotypeLabel";
+ case "1022":
+ return "Comment_AnnotatedElementEdge";
+ case "4014":
+ return "Constraint_ConstrainedElementEdge";
+ case "8500":
+ return "Constraint_ContextEdge";
+ case "8501":
+ return "Constraint_KeywordLabel";
+ case "1005":
+ return "Package_PackagedElementCompartment";
+ case "11":
+ return "Package_PackagedElementCompartment_CN";
+ case "1042":
+ return "Profile_PackagedElementCompartment";
+ case "1051":
+ return "Profile_PackagedElementCompartment_CN";
+ case "1071":
+ return "Stereotype_AttributeCompartment";
+ case "1052":
+ return "Stereotype_AttributeCompartment_CN";
+ case "1019":
+ return "Stereotype_OperationCompartment";
+ case "1053":
+ return "Stereotype_OperationCompartment_CN";
+ case "1057":
+ return "Model_PackagedElementCompartment";
+ case "1058":
+ return "Model_PackagedElementCompartment_CN";
+ case "1062":
+ return "Enumeration_LiteralCompartment_CN";
+ case "1063":
+ return "Enumeration_LiteralCompartment";
+ case "1067":
+ return "DataType_AttributeCompartment";
+ case "1069":
+ return "DataType_AttributeCompartment_CN";
+ case "1068":
+ return "DataType_OperationCompartment";
+ case "1070":
+ return "DataType_OperationCompartment_CN";
+ case "7017":
+ return "Class_AttributeCompartment";
+ case "7011":
+ return "Class_AttributeCompartment_CN";
+ case "7018":
+ return "Class_OperationCompartment";
+ case "7012":
+ return "Class_OperationCompartment_CN";
+ default:
+ return defaultGetNewVisualID(oldVisualID);
+ }
+ }
+
+ private static String defaultGetNewVisualID(String oldVisualID) {
+ return oldVisualID;
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomGraphicalNodeEditPolicy.java index 82bf1ab0731..81d7600af4d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomGraphicalNodeEditPolicy.java @@ -56,10 +56,10 @@ public class CustomGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPolic // case of associationClass
CreateElementRequestAdapter requestAdapter = ((CreateConnectionViewAndElementRequest) request).getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class);
- if (UMLElementTypes.Dependency_4018.equals(createElementRequest.getElementType())) {
+ if (UMLElementTypes.Dependency_BranchEdge.equals(createElementRequest.getElementType())) {
MultiDependencyHelper multiDependencyHelper = new MultiDependencyHelper(getEditingDomain());
return multiDependencyHelper.getCommand(((CreateConnectionViewAndElementRequest) request), c);
- } else if (UMLElementTypes.Association_4019.equals(createElementRequest.getElementType())) {
+ } else if (UMLElementTypes.Association_BranchEdge.equals(createElementRequest.getElementType())) {
MultiAssociationHelper multiAssociationHelper = new MultiAssociationHelper(getEditingDomain());
return multiAssociationHelper.getCommand(((CreateConnectionViewAndElementRequest) request), c);
} else {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ProfileDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ProfileDiagramDragDropEditPolicy.java index 0c5e83cdeed..1aa851458c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ProfileDiagramDragDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ProfileDiagramDragDropEditPolicy.java @@ -296,11 +296,11 @@ public class ProfileDiagramDragDropEditPolicy extends CommonDiagramDragDropEditP return UnexecutableCommand.INSTANCE; } if (CommentEditPart.VISUAL_ID.equals(nodeVISUALID)) { - return getDropCommentCommand((Comment) semanticLink, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView(), (IHintedType) UMLElementTypes.Comment_1002, - (IHintedType) UMLElementTypes.CommentAnnotatedElement_1022); + return getDropCommentCommand((Comment) semanticLink, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView(), (IHintedType) UMLElementTypes.Comment_Shape, + (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge); } else if (CommentEditPartCN.VISUAL_ID.equals(nodeVISUALID)) { - return getDropCommentCommand((Comment) semanticLink, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView(), (IHintedType) UMLElementTypes.Comment_1007, - (IHintedType) UMLElementTypes.CommentAnnotatedElement_1022); + return getDropCommentCommand((Comment) semanticLink, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView(), (IHintedType) UMLElementTypes.Comment_Shape_CN, + (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge); } return UnexecutableCommand.INSTANCE; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.assistants b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.assistants index fa941937e0c..6aa11d7450e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.assistants +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.assistants @@ -1,270 +1,270 @@ -<?xml version="1.0" encoding="ASCII"?>
-<assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" name="PapyrusUMLProfileDiagram">
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Profile" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Profile_1000"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Model" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Model_2005"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Profile" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Package_1004"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Model" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Model_1027"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Profile" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Profile_1024"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"/>
- <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="DataType" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="DataType" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.DataType_3027"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Enumeration" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Enumeration" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Stereotype" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Class_2008"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Stereotype" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Class_3010"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Metaclass" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Metaclass" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="AssociationNode" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="PrimitiveType" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="PrimitiveType" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Dependency" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Comment" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Comment_1002"/>
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Comment" elementTypeID="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Association_2015" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Class_2008" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Comment_1002" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Model_2005" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Profile_1030" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Package_1004" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.DataType_2010" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016" filter="//@ownedFilter.0"/>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026" filter="//@popupAssistant.14/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.14/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019" filter="//@popupAssistant.15/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.15/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.8 //@ownedFilter.9" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037" filter="//@popupAssistant.16/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.16/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.10 //@ownedFilter.11" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018" filter="//@popupAssistant.17/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.17/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.8 //@ownedFilter.9" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002" filter="//@popupAssistant.18/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.18/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020" filter="//@popupAssistant.19/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.19/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023" filter="//@popupAssistant.20/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.20/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Class_3010" filter="//@popupAssistant.21/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.21/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028" filter="//@popupAssistant.22/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.22/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.2 //@ownedFilter.5" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007" filter="//@popupAssistant.23/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.23/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Model_1027" filter="//@popupAssistant.24/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.24/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Profile_1024" filter="//@popupAssistant.25/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.25/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012" filter="//@popupAssistant.26/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.26/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028" filter="//@popupAssistant.27/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.27/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025" filter="//@popupAssistant.28/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.28/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.DataType_3027" filter="//@popupAssistant.29/@ownedFilter">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.29/@ownedFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedFilter>
- </popupAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Extension_1013" sourceFilter="//@ownedFilter.7" targetFilter="//@connectionAssistant.0/@ownedTargetFilter">
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.0/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Association_4001" sourceFilter="//@connectionAssistant.1/@ownedSourceFilter" targetFilter="//@connectionAssistant.1/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.1/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.1/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045" sourceFilter="//@connectionAssistant.2/@ownedSourceFilter" targetFilter="//@connectionAssistant.2/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.2/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.2/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.2 //@ownedFilter.5" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Association_4019" sourceFilter="//@connectionAssistant.3/@ownedSourceFilter" targetFilter="//@connectionAssistant.3/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.3/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.3/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002" sourceFilter="//@connectionAssistant.4/@ownedSourceFilter" targetFilter="//@connectionAssistant.4/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.4/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.4/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008" sourceFilter="//@connectionAssistant.5/@ownedSourceFilter" targetFilter="//@connectionAssistant.5/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.5/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.5/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018" sourceFilter="//@connectionAssistant.6/@ownedSourceFilter" targetFilter="//@connectionAssistant.6/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.6/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.6/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064" sourceFilter="//@connectionAssistant.7/@ownedSourceFilter" targetFilter="//@connectionAssistant.7/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.7/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.7/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065" sourceFilter="//@connectionAssistant.8/@ownedSourceFilter" targetFilter="//@connectionAssistant.8/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.8/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.8/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022" sourceFilter="//@connectionAssistant.9/@ownedSourceFilter" targetFilter="//@connectionAssistant.9/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.9/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.24 //@ownedFilter.25" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.9/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.24 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.25 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014" sourceFilter="//@connectionAssistant.10/@ownedSourceFilter" targetFilter="//@connectionAssistant.10/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.10/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.22 //@ownedFilter.23" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.10/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.24 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.25 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <connectionAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500" sourceFilter="//@connectionAssistant.11/@ownedSourceFilter" targetFilter="//@connectionAssistant.11/@ownedTargetFilter">
- <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.11/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.22 //@ownedFilter.23" operator="or"/>
- </ownedSourceFilter>
- <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.11/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7">
- <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.11 //@ownedFilter.9" operator="or"/>
- </ownedTargetFilter>
- </connectionAssistant>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Dependency_2014</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Association_2015</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Class_2008</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Comment_1002</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Constraint_1014</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Model_2005</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Profile_1030</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Package_1004</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.DataType_2010</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Diagram_2016</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Class_3010</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Model_1027</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Profile_1024</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Constraint_1028</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.DataType_3027</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Extension_1013</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Association_4001</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Association_4019</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Generalization_4002</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Dependency_4008</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Dependency_4018</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014</elementTypeID>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500</elementTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.Extension_1013</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.Association_4001</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.Association_4019</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.Generalization_4002</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.Dependency_4008</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.Dependency_4018</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014</relationshipTypeID>
- <relationshipTypeID>org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500</relationshipTypeID>
-</assistant:ModelingAssistantProvider>
+<?xml version="1.0" encoding="UTF-8"?> +<assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" name="PapyrusUMLProfileDiagram"> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Profile" elementTypeID="org.eclipse.papyrus.umldi.Profile_ProfileDiagram"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Model" elementTypeID="org.eclipse.papyrus.umldi.Model_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Profile" elementTypeID="org.eclipse.papyrus.umldi.Profile_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.umldi.Package_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Model" elementTypeID="org.eclipse.papyrus.umldi.Model_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Profile" elementTypeID="org.eclipse.papyrus.umldi.Profile_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.umldi.Package_Shape_CN"/> + <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="DataType" elementTypeID="org.eclipse.papyrus.umldi.DataType_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="DataType" elementTypeID="org.eclipse.papyrus.umldi.DataType_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Enumeration" elementTypeID="org.eclipse.papyrus.umldi.Enumeration_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Enumeration" elementTypeID="org.eclipse.papyrus.umldi.Enumeration_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Stereotype" elementTypeID="org.eclipse.papyrus.umldi.Stereotype_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.umldi.Class_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Stereotype" elementTypeID="org.eclipse.papyrus.umldi.Stereotype_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.umldi.Class_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Metaclass" elementTypeID="org.eclipse.papyrus.umldi.Class_MetaclassShape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Metaclass" elementTypeID="org.eclipse.papyrus.umldi.Class_MetaclassShape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="AssociationNode" elementTypeID="org.eclipse.papyrus.umldi.Association_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="PrimitiveType" elementTypeID="org.eclipse.papyrus.umldi.PrimitiveType_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="PrimitiveType" elementTypeID="org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Dependency" elementTypeID="org.eclipse.papyrus.umldi.Dependency_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Comment" elementTypeID="org.eclipse.papyrus.umldi.Comment_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Comment" elementTypeID="org.eclipse.papyrus.umldi.Comment_Shape_CN"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Dependency_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Association_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Stereotype_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Class_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Class_MetaclassShape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Comment_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Model_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Profile_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Package_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Enumeration_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.PrimitiveType_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.DataType_Shape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Diagram_ShortcutShape" filter="//@ownedFilter.0"/> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN" filter="//@popupAssistant.14/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.14/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel" filter="//@popupAssistant.15/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.15/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.8 //@ownedFilter.9" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel" filter="//@popupAssistant.16/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.16/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.10 //@ownedFilter.11" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel" filter="//@popupAssistant.17/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.17/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.8 //@ownedFilter.9" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Property_ClassAttributeLabel" filter="//@popupAssistant.18/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.18/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Operation_ClassOperationLabel" filter="//@popupAssistant.19/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.19/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Stereotype_Shape_CN" filter="//@popupAssistant.20/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.20/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Class_Shape_CN" filter="//@popupAssistant.21/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.21/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Class_MetaclassShape_CN" filter="//@popupAssistant.22/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.22/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.2 //@ownedFilter.5" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Comment_Shape_CN" filter="//@popupAssistant.23/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.23/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Model_Shape_CN" filter="//@popupAssistant.24/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.24/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Profile_Shape_CN" filter="//@popupAssistant.25/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.25/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Package_Shape_CN" filter="//@popupAssistant.26/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.26/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN" filter="//@popupAssistant.27/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.27/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.Enumeration_Shape_CN" filter="//@popupAssistant.28/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.28/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <popupAssistant elementTypeID="org.eclipse.papyrus.umldi.DataType_Shape_CN" filter="//@popupAssistant.29/@ownedFilter"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@popupAssistant.29/@ownedFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedFilter> + </popupAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Extension_Edge" sourceFilter="//@ownedFilter.7" targetFilter="//@connectionAssistant.0/@ownedTargetFilter"> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.0/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Association_Edge" sourceFilter="//@connectionAssistant.1/@ownedSourceFilter" targetFilter="//@connectionAssistant.1/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.1/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.1/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.ProfileApplication_Edge" sourceFilter="//@connectionAssistant.2/@ownedSourceFilter" targetFilter="//@connectionAssistant.2/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.2/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.2/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.2 //@ownedFilter.5" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Association_BranchEdge" sourceFilter="//@connectionAssistant.3/@ownedSourceFilter" targetFilter="//@connectionAssistant.3/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.3/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.3/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Generalization_Edge" sourceFilter="//@connectionAssistant.4/@ownedSourceFilter" targetFilter="//@connectionAssistant.4/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.4/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.4/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Dependency_Edge" sourceFilter="//@connectionAssistant.5/@ownedSourceFilter" targetFilter="//@connectionAssistant.5/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.5/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.5/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Dependency_BranchEdge" sourceFilter="//@connectionAssistant.6/@ownedSourceFilter" targetFilter="//@connectionAssistant.6/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.6/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.6/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.ElementImport_Edge" sourceFilter="//@connectionAssistant.7/@ownedSourceFilter" targetFilter="//@connectionAssistant.7/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.7/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.7/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.PackageImport_Edge" sourceFilter="//@connectionAssistant.8/@ownedSourceFilter" targetFilter="//@connectionAssistant.8/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.8/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.8/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge" sourceFilter="//@connectionAssistant.9/@ownedSourceFilter" targetFilter="//@connectionAssistant.9/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.9/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.24 //@ownedFilter.25" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.9/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.24 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.25 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge" sourceFilter="//@connectionAssistant.10/@ownedSourceFilter" targetFilter="//@connectionAssistant.10/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.10/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.22 //@ownedFilter.23" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.10/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.24 //@ownedFilter.22 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.25 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.23 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <connectionAssistant elementTypeID="org.eclipse.papyrus.umldi.Constraint_ContextEdge" sourceFilter="//@connectionAssistant.11/@ownedSourceFilter" targetFilter="//@connectionAssistant.11/@ownedTargetFilter"> + <ownedSourceFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.11/@ownedSourceFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.22 //@ownedFilter.23" operator="or"/> + </ownedSourceFilter> + <ownedTargetFilter xsi:type="filters:CompoundFilter" filter="//@connectionAssistant.11/@ownedTargetFilter/@ownedFilter.0 //@ownedFilter.7"> + <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.18 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.16 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.10 //@ownedFilter.19 //@ownedFilter.8 //@ownedFilter.20 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.17 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.11 //@ownedFilter.9" operator="or"/> + </ownedTargetFilter> + </connectionAssistant> + <elementTypeID>org.eclipse.papyrus.umldi.Package_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.PrimitiveType_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Model_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Class_MetaclassShape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Diagram_ShortcutShape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Dependency_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Class_MetaclassShape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.ProfileApplication_Edge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Constraint_PackagedElementShape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Operation_ClassOperationLabel</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Association_BranchEdge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Generalization_Edge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Constraint_ContextEdge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Profile_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.uml.diagram.profile.Package_1004</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Comment_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Dependency_Edge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Comment_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Association_Edge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.ElementImport_Edge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.PackageImport_Edge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.DataType_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Stereotype_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Extension_Edge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Model_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Association_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Class_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Dependency_BranchEdge</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Enumeration_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Enumeration_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Property_ClassAttributeLabel</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Profile_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.DataType_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Stereotype_Shape</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Class_Shape_CN</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel</elementTypeID> + <elementTypeID>org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge</elementTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.ProfileApplication_Edge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.PackageImport_Edge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Generalization_Edge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Association_BranchEdge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Constraint_ContextEdge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Dependency_BranchEdge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Extension_Edge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Dependency_Edge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.ElementImport_Edge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Association_Edge</relationshipTypeID> + <relationshipTypeID>org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge</relationshipTypeID> +</assistant:ModelingAssistantProvider> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations deleted file mode 100644 index 3d0f2c40621..00000000000 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations +++ /dev/null @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.profile.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLProfileDiagram" xmi:id="_MKAB8ORAEeSg9_CuHKArkw" xmi:version="2.0">
- <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_4001" name="Association" xmi:id="_MRnF0ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRnF0eRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_4019" name="Association Branch" xmi:id="_MRo7AORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRo7AeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_2015" name="Association Node" xmi:id="_MRLoAORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRLoAeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.profile.Class_3010" name="Class" xmi:id="_MQ_awORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MQ_aweRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.uml.diagram.profile.Class_2008" name="Class" xmi:id="_MRM2IORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRM2IeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1007" identifier="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007" name="Comment" xmi:id="_MRB3AORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_MRB3AeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1002" identifier="org.eclipse.papyrus.uml.diagram.profile.Comment_1002" name="Comment" xmi:id="_MROrUORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_MROrUeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1022" identifier="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022" name="Comment Annotated Element" xmi:id="_MSWFoORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1028" identifier="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028" name="Constraint" xmi:id="_MRGIcORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_MRGIceRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1014" identifier="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014" name="Constraint" xmi:id="_MRPSYORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_MRPSYeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014" name="Constraint Constrained Element" xmi:id="_MSWssORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="8500" identifier="org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500" name="Constraint Context" xmi:id="_MSWsseRAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3027" identifier="org.eclipse.papyrus.uml.diagram.profile.DataType_3027" name="Data Type" xmi:id="_MRIksORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_MRIkseRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2010" identifier="org.eclipse.papyrus.uml.diagram.profile.DataType_2010" name="Data Type" xmi:id="_MRUK4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_MRUK4eRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014" name="Dependency" xmi:id="_MRKZ4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRKZ4eRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008" name="Dependency" xmi:id="_MRqJIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRqJIeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018" name="Dependency" xmi:id="_MRqwMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRqwMeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1064" identifier="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064" name="Element Import" xmi:id="_MRr-UORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_MRr-UeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.ElementImport</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3025" identifier="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025" name="Enumeration" xmi:id="_MRHWkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_MRHWkeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2006" identifier="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006" name="Enumeration" xmi:id="_MRS8wORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_MRS8weRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1037" identifier="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037" name="Enumeration Literal" xmi:id="_MQ6iQORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_MQ6iQeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1013" identifier="org.eclipse.papyrus.uml.diagram.profile.Extension_1013" name="Extension" xmi:id="_MRl3sORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extension.gif" xmi:id="_MRl3seRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Extension</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002" name="Generalization" xmi:id="_MRpiEORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_MRpiEeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3028" identifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028" name="Metaclass" xmi:id="_MRAo4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRAo4eRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1031" identifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031" name="Metaclass" xmi:id="_MRNdMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRNdMeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1027" identifier="org.eclipse.papyrus.uml.diagram.profile.Model_1027" name="Model" xmi:id="_MRDFIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_MRDFIeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2005" identifier="org.eclipse.papyrus.uml.diagram.profile.Model_2005" name="Model" xmi:id="_MRQggORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_MRQggeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019" name="Operation" xmi:id="_MQ3e8ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_MQ3e8eRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020" name="Operation" xmi:id="_MQ9lkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_MQ9lkeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1012" identifier="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012" name="Package" xmi:id="_MRE6UORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_MRE6UeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2007" identifier="org.eclipse.papyrus.uml.diagram.profile.Package_1004" name="Package" xmi:id="_MRSVsORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_MRSVseRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1065" identifier="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065" name="Package Import" xmi:id="_MRslYORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_MRslYeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3026" identifier="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026" name="Primitive Type" xmi:id="_MQ1CsORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_MQ1CseRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2009" identifier="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009" name="Primitive Type" xmi:id="_MRTj0ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_MRTj0eRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="PapyrusUMLProfileDiagram" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1000" name="Profile" xmi:id="_MQlyIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MQmZMORAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1024" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1024" name="Profile" xmi:id="_MRDsMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MRDsMeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1030" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1030" name="Profile" xmi:id="_MRRHkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MRRHkeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1045" identifier="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045" name="Profile Application" xmi:id="_MRns4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif" xmi:id="_MRns4eRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.ProfileApplication</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018" name="Property" xmi:id="_MQ7JUORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_MQ7JUeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002" name="Property" xmi:id="_MQ8XcORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_MQ8XceRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016" name="Short Cut Diagram" xmi:id="_MRkCgORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Diagram.gif" xmi:id="_MRkCgeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1023" identifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023" name="Stereotype" xmi:id="_MQ-MoORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_MQ-MoeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="1026" identifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026" name="Stereotype" xmi:id="_MRMPEORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_MRMPEeRAEeSg9_CuHKArkw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>
- </elementTypeConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file 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 17fe1fe6c93..f9d3ca81d4a 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 @@ -4,7 +4,8 @@ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" - xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension"> + xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension" + xsi:schemaLocation="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension ../../org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore"> <gmfgen:GenEditorGenerator packageNamePrefix="org.eclipse.papyrus.uml.diagram.profile" modelID="PapyrusUMLProfileDiagram" @@ -26,6 +27,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Profile_ProfileDiagram" displayName="ProfileDiagram" definedExternally="true" editHelperClassName="ProfileDiagramEditHelper"/> @@ -62,6 +64,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -133,7 +136,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019" + uniqueIdentifier="org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel" displayName="Operation" definedExternally="true" editHelperClassName="DataTypeOperationEditHelper"/> @@ -181,6 +184,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -228,7 +232,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018" + uniqueIdentifier="org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel" displayName="Property" definedExternally="true" editHelperClassName="DataTypePropertyEditHelper"/> @@ -281,7 +285,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002" + uniqueIdentifier="org.eclipse.papyrus.umldi.Property_ClassAttributeLabel" displayName="Property" definedExternally="true" editHelperClassName="ClassPropertyEditHelper"/> @@ -334,7 +338,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020" + uniqueIdentifier="org.eclipse.papyrus.umldi.Operation_ClassOperationLabel" displayName="Operation" definedExternally="true" editHelperClassName="ClassOperationEditHelper"/> @@ -386,7 +390,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023" + uniqueIdentifier="org.eclipse.papyrus.umldi.Stereotype_Shape_CN" displayName="Stereotype" definedExternally="true" editHelperClassName="StereotypeEditHelper"/> @@ -466,6 +470,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Class_Shape_CN" displayName="Class" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.3/@elementType"/> @@ -543,7 +548,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028" + uniqueIdentifier="org.eclipse.papyrus.umldi.Class_MetaclassShape_CN" displayName="Metaclass" definedExternally="true" editHelperClassName="MetaclassEditHelper"/> @@ -612,7 +617,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007" + uniqueIdentifier="org.eclipse.papyrus.umldi.Comment_Shape_CN" displayName="Comment" definedExternally="true" editHelperClassName="CommentEditHelperCN"/> @@ -678,6 +683,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Model_Shape_CN" displayName="Model" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.7/@elementType"/> @@ -755,6 +761,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Profile_Shape_CN" displayName="Profile" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.8/@elementType"/> @@ -835,7 +842,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012" + uniqueIdentifier="org.eclipse.papyrus.umldi.Package_Shape_CN" displayName="Package" definedExternally="true" editHelperClassName="PackageEditHelperCN"/> @@ -914,6 +921,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN" displayName="Constraint" definedExternally="true" editHelperClassName="ConstraintEditHelperCN"/> @@ -993,6 +1001,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Enumeration_Shape_CN" displayName="Enumeration" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.10/@elementType"/> @@ -1072,6 +1081,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.DataType_Shape_CN" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.12/@elementType"/> <viewmap @@ -1142,7 +1152,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014" + uniqueIdentifier="org.eclipse.papyrus.umldi.Dependency_Shape" displayName="Dependency" definedExternally="true" editHelperClassName="DependencyEditHelper"/> @@ -1195,6 +1205,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Association_Shape" displayName="AssociationNode" definedExternally="true"/> <viewmap @@ -1230,7 +1241,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026" + uniqueIdentifier="org.eclipse.papyrus.umldi.Stereotype_Shape" displayName="Stereotype" definedExternally="true" editHelperClassName="StereotypeEditHelper"/> @@ -1307,7 +1318,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Class_2008" + uniqueIdentifier="org.eclipse.papyrus.umldi.Class_Shape" displayName="Class" definedExternally="true" editHelperClassName="ClassEditHelper"/> @@ -1384,7 +1395,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:SpecializationType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031" + uniqueIdentifier="org.eclipse.papyrus.umldi.Class_MetaclassShape" displayName="Metaclass" definedExternally="true" metamodelType="/0/@diagram/@childNodes.8/@elementType"/> @@ -1452,7 +1463,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Comment_1002" + uniqueIdentifier="org.eclipse.papyrus.umldi.Comment_Shape" displayName="Comment" definedExternally="true" editHelperClassName="CommentEditHelper"/> @@ -1506,6 +1517,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape" displayName="Constraint" definedExternally="true"/> <viewmap @@ -1591,6 +1603,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Model_Shape" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -1665,7 +1678,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1030" + uniqueIdentifier="org.eclipse.papyrus.umldi.Profile_Shape" displayName="Profile" definedExternally="true" editHelperClassName="ProfileEditHelper"/> @@ -1744,7 +1757,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Package_1004" + uniqueIdentifier="org.eclipse.papyrus.umldi.Package_Shape" displayName="Package" definedExternally="true" editHelperClassName="PackageEditHelper"/> @@ -1818,6 +1831,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Enumeration_Shape" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -1891,6 +1905,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.PrimitiveType_Shape" definedExternally="true" metamodelType="/0/@diagram/@childNodes.0/@elementType"/> <viewmap @@ -1957,7 +1972,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" - uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.DataType_2010" + uniqueIdentifier="org.eclipse.papyrus.umldi.DataType_Shape" displayName="DataType" definedExternally="true" editHelperClassName="DataTypeEditHelper"/> @@ -2033,6 +2048,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Diagram_ShortcutShape" displayName="ShortCutDiagram" definedExternally="true" editHelperClassName="ShortCutDiagramEditHelper"/> @@ -2085,6 +2101,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Extension_Edge" displayName="Extension" definedExternally="true"/> <viewmap @@ -2117,6 +2134,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Association_Edge" displayName="Association" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/> @@ -2326,6 +2344,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.ProfileApplication_Edge" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -2354,6 +2373,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Association_BranchEdge" displayName="AssociationBranch" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/> @@ -2447,6 +2467,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Generalization_Edge" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -2505,6 +2526,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Dependency_Edge" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/> <viewmap @@ -2599,6 +2621,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Dependency_BranchEdge" definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/> <viewmap @@ -2640,6 +2663,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.ElementImport_Edge" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -2727,6 +2751,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:MetamodelType" + uniqueIdentifier="org.eclipse.papyrus.umldi.PackageImport_Edge" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -2790,6 +2815,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -2812,6 +2838,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge" definedExternally="true"/> <viewmap xsi:type="gmfgen:FigureViewmap" @@ -2838,6 +2865,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType" + uniqueIdentifier="org.eclipse.papyrus.umldi.Constraint_ContextEdge" displayName="Undefined" definedExternally="true"/> <viewmap @@ -3884,4 +3912,348 @@ linkLabels="/0/@diagram/@links.1/@labels.1 /0/@diagram/@links.5/@labels.0" visibleByDefault="false"/> </papyrusgmfgenextension:PapyrusExtensionRootNode> + <papyrusgmfgenextension:VisualIDOverride + genView="/0/@diagram" + visualID="Profile_ProfileDiagram"> + <child + genView="/0/@diagram/@childNodes.1" + visualID="Operation_DataTypeOperationLabel"/> + <child + genView="/0/@diagram/@childNodes.2" + visualID="EnumerationLiteral_LiteralLabel"/> + <child + genView="/0/@diagram/@childNodes.3" + visualID="Property_DataTypeAttributeLabel"/> + <child + genView="/0/@diagram/@childNodes.4" + visualID="Property_ClassAttributeLabel"/> + <child + genView="/0/@diagram/@childNodes.5" + visualID="Operation_ClassOperationLabel"/> + <child + genView="/0/@diagram/@childNodes.0" + visualID="PrimitiveType_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.0/@labels.0" + visualID="PrimitiveType_NameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.6" + visualID="Stereotype_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.6/@labels.0" + visualID="Stereotype_NameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.7" + visualID="Class_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.7/@labels.0" + visualID="Class_NameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.8" + visualID="Class_MetaclassShape_CN"> + <child + genView="/0/@diagram/@childNodes.8/@labels.0" + visualID="Class_MetaclassNameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.9" + visualID="Comment_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.9/@labels.0" + visualID="Comment_BodyLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.10" + visualID="Model_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.10/@labels.0" + visualID="Model_NameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.11" + visualID="Profile_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.11/@labels.0" + visualID="Profile_NameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.12" + visualID="Package_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.12/@labels.0" + visualID="Package_NameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.13" + visualID="Constraint_PackagedElementShape_CN"> + <child + genView="/0/@diagram/@childNodes.13/@labels.0" + visualID="Constraint_NameLabel_CN"/> + <child + genView="/0/@diagram/@childNodes.13/@labels.1" + visualID="Constraint_BodyLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.14" + visualID="Enumeration_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.14/@labels.0" + visualID="Enumeration_NameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@childNodes.15" + visualID="DataType_Shape_CN"> + <child + genView="/0/@diagram/@childNodes.15/@labels.0" + visualID="DataType_NameLabel_CN"/> + </child> + <child + genView="/0/@diagram/@compartments.0" + visualID="Package_PackagedElementCompartment"/> + <child + genView="/0/@diagram/@compartments.1" + visualID="Package_PackagedElementCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.2" + visualID="Profile_PackagedElementCompartment"/> + <child + genView="/0/@diagram/@compartments.3" + visualID="Profile_PackagedElementCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.4" + visualID="Stereotype_AttributeCompartment"/> + <child + genView="/0/@diagram/@compartments.5" + visualID="Stereotype_AttributeCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.6" + visualID="Stereotype_OperationCompartment"/> + <child + genView="/0/@diagram/@compartments.7" + visualID="Stereotype_OperationCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.8" + visualID="Model_PackagedElementCompartment"/> + <child + genView="/0/@diagram/@compartments.9" + visualID="Model_PackagedElementCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.10" + visualID="Enumeration_LiteralCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.11" + visualID="Enumeration_LiteralCompartment"/> + <child + genView="/0/@diagram/@compartments.12" + visualID="DataType_AttributeCompartment"/> + <child + genView="/0/@diagram/@compartments.13" + visualID="DataType_AttributeCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.14" + visualID="DataType_OperationCompartment"/> + <child + genView="/0/@diagram/@compartments.15" + visualID="DataType_OperationCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.16" + visualID="Class_AttributeCompartment"/> + <child + genView="/0/@diagram/@compartments.17" + visualID="Class_AttributeCompartment_CN"/> + <child + genView="/0/@diagram/@compartments.18" + visualID="Class_OperationCompartment"/> + <child + genView="/0/@diagram/@compartments.19" + visualID="Class_OperationCompartment_CN"/> + <child + genView="/0/@diagram/@topLevelNodes.0" + visualID="Dependency_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.0/@labels.0" + visualID="Dependency_MultiNameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.1" + visualID="Association_Shape"/> + <child + genView="/0/@diagram/@topLevelNodes.2" + visualID="Stereotype_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.2/@labels.0" + visualID="Stereotype_NameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.3" + visualID="Class_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.3/@labels.0" + visualID="Class_NameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.4" + visualID="Class_MetaclassShape"> + <child + genView="/0/@diagram/@topLevelNodes.4/@labels.0" + visualID="Class_MetaclassNameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.5" + visualID="Comment_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.5/@labels.0" + visualID="Comment_BodyLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.6" + visualID="Constraint_PackagedElementShape"> + <child + genView="/0/@diagram/@topLevelNodes.6/@labels.0" + visualID="Constraint_NameLabel"/> + <child + genView="/0/@diagram/@topLevelNodes.6/@labels.1" + visualID="Constraint_BodyLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.7" + visualID="Model_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.7/@labels.0" + visualID="Model_NameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.8" + visualID="Profile_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.8/@labels.0" + visualID="Profile_NameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.9" + visualID="Package_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.9/@labels.0" + visualID="Package_NameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.10" + visualID="Enumeration_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.10/@labels.0" + visualID="Enumeration_NameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.11" + visualID="PrimitiveType_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.11/@labels.0" + visualID="PrimitiveType_NameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.12" + visualID="DataType_Shape"> + <child + genView="/0/@diagram/@topLevelNodes.12/@labels.0" + visualID="DataType_NameLabel"/> + </child> + <child + genView="/0/@diagram/@topLevelNodes.13" + visualID="Diagram_ShortcutShape"> + <child + genView="/0/@diagram/@topLevelNodes.13/@labels.0" + visualID="Diagram_NameLabel"/> + </child> + <child + genView="/0/@diagram/@links.0" + visualID="Extension_Edge"/> + <child + genView="/0/@diagram/@links.1" + visualID="Association_Edge"> + <child + genView="/0/@diagram/@links.1/@labels.0" + visualID="Association_StereotypeLabel"/> + <child + genView="/0/@diagram/@links.1/@labels.1" + visualID="Association_NameLabel"/> + <child + genView="/0/@diagram/@links.1/@labels.2" + visualID="Association_TargetRoleLabel"/> + <child + genView="/0/@diagram/@links.1/@labels.3" + visualID="Association_SourceRoleLabel"/> + <child + genView="/0/@diagram/@links.1/@labels.4" + visualID="Association_SourceMultiplicityLabel"/> + <child + genView="/0/@diagram/@links.1/@labels.5" + visualID="Association_TargetMultiplicityLabel"/> + </child> + <child + genView="/0/@diagram/@links.2" + visualID="ProfileApplication_Edge"/> + <child + genView="/0/@diagram/@links.3" + visualID="Association_BranchEdge"> + <child + genView="/0/@diagram/@links.3/@labels.0" + visualID="Association_BranchRoleLabel"/> + <child + genView="/0/@diagram/@links.3/@labels.1" + visualID="Association_BranchMultiplicityLabel"/> + </child> + <child + genView="/0/@diagram/@links.4" + visualID="Generalization_Edge"> + <child + genView="/0/@diagram/@links.4/@labels.0" + visualID="Generalization_StereotypeLabel"/> + </child> + <child + genView="/0/@diagram/@links.5" + visualID="Dependency_Edge"> + <child + genView="/0/@diagram/@links.5/@labels.0" + visualID="Dependency_NameLabel"/> + <child + genView="/0/@diagram/@links.5/@labels.1" + visualID="Dependency_StereotypeLabel"/> + </child> + <child + genView="/0/@diagram/@links.6" + visualID="Dependency_BranchEdge"/> + <child + genView="/0/@diagram/@links.7" + visualID="ElementImport_Edge"> + <child + genView="/0/@diagram/@links.7/@labels.0" + visualID="ElementImport_AliasLabel"/> + <child + genView="/0/@diagram/@links.7/@labels.1" + visualID="ElementImport_StereotypeLabel"/> + </child> + <child + genView="/0/@diagram/@links.8" + visualID="PackageImport_Edge"> + <child + genView="/0/@diagram/@links.8/@labels.0" + visualID="PackageImport_StereotypeLabel"/> + </child> + <child + genView="/0/@diagram/@links.9" + visualID="Comment_AnnotatedElementEdge"/> + <child + genView="/0/@diagram/@links.10" + visualID="Constraint_ConstrainedElementEdge"/> + <child + genView="/0/@diagram/@links.11" + visualID="Constraint_ContextEdge"> + <child + genView="/0/@diagram/@links.11/@labels.0" + visualID="Constraint_KeywordLabel"/> + </child> + </papyrusgmfgenextension:VisualIDOverride> </xmi:XMI> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties index f636418f21b..ecd1050495c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties @@ -31,47 +31,9 @@ tab.diagram=Rulers & Grid tab.domain=Core cmdcategory.name=PapyrusUMLProfilDiagram Editor Commands cmdcategory.desc=PapyrusUMLProfilDiagram Editor Commands -metatype.name.Profile_1000=ProfileDiagram -metatype.name.Comment_1002=Comment -metatype.name.Constraint_1014=Constraint -metatype.name.Stereotype_1026=Stereotype -metatype.name.Class_1031=Metaclass -metatype.name.Profile_1030=ProfileTN -metatype.name.Comment_1007=CommentCN -metatype.name.Package_1012=PackageCN -metatype.name.Stereotype_1023=Stereotype -metatype.name.Extension_1013=Extension -metatype.name.Profile_1024=ProfileCN -metatype.name.CommentAnnotatedElement_1022=Undefined -metatype.name.Model_1027=Model -metatype.name.EnumerationLiteral_1037=EnumerationLiteral -metatype.name.Constraint_1028=ConstraintCN -metatype.name.ProfileApplication_1045=ProfileApplication -metatype.name.ElementImport_1064=ElementImport -metatype.name.PackageImport_1065=PackageImport -metatype.name.Dependency_4008=Dependency -metatype.name.Association_4001=Association -metatype.name.DataType_2010=DataType -metatype.name.DataType_3027=DataType -metatype.name.Enumeration_2006=Enumeration -metatype.name.Enumeration_3025=EnumerationCN -metatype.name.Package_2007=Package -metatype.name.Generalization_4002=Generalization -metatype.name.Association_4019=Association -metatype.name.Dependency_4018=Dependency -metatype.name.Association_2015=Association -metatype.name.Dependency_2014=DependencyNode -metatype.name.Property_3002=ClassProperty -metatype.name.Operation_3019=DataTypeOperation -metatype.name.Property_3018=DataTypeProperty -metatype.name.Model_2005=Model domainNavigatorContentName=*.PapyrusUMLProfile model contents prefpage.org.eclipse.uml2.uml.diagram.printing=Printing prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid=RulersAndGrid -metatype.name.Operation_3020=ClassOperation -metatype.name.Class_3028=Metaclass -metatype.name.Diagram_2016=ShortCutDiagram -metatype.name.ConstraintConstrainedElement_4014=Undefined editorName=PapyrusUMLProfileDiagram Diagram Editing newWizardName=PapyrusUMLProfileDiagram Diagram newWizardDesc=Creates PapyrusUMLProfileDiagram diagram. @@ -81,10 +43,4 @@ prefpage.org.eclipse.uml2.uml.diagram.general=UML Diagram prefpage.org.eclipse.uml2.uml.diagram.appearance=Appearance prefpage.org.eclipse.uml2.uml.diagram.connections=Connections prefpage.org.eclipse.uml2.uml.diagram.pathmaps=Pathmaps -metatype.name.PrimitiveType_3026=PrimitiveType -metatype.name.PrimitiveType_2009=PrimitiveType -metatype.name.ConstraintContext_8500=Undefined -metatype.name.Class_2008=Class -metatype.name.Class_3010=Class - pluginDescription=This plugin provides the UML Profile Diagram 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 66d2797748b..f827d61874b 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 @@ -382,8 +382,8 @@ <viewProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLViewProvider"> <Priority name="Lowest"/> <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLProfileDiagram"/> - <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2015,1026,2008,1031,1002,1014,2005,1030,2007,2006,2009,2010,2016,3026,3019,1037,3018,3002,3020,1023,3010,3028,1007,1027,1024,1012,1028,3025,3027"/> - <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014,8500"/> + <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Dependency_Shape,Association_Shape,Stereotype_Shape,Class_Shape,Class_MetaclassShape,Comment_Shape,Constraint_PackagedElementShape,Model_Shape,Profile_Shape,Package_Shape,Enumeration_Shape,PrimitiveType_Shape,DataType_Shape,Diagram_ShortcutShape,PrimitiveType_Shape_CN,Operation_DataTypeOperationLabel,EnumerationLiteral_LiteralLabel,Property_DataTypeAttributeLabel,Property_ClassAttributeLabel,Operation_ClassOperationLabel,Stereotype_Shape_CN,Class_Shape_CN,Class_MetaclassShape_CN,Comment_Shape_CN,Model_Shape_CN,Profile_Shape_CN,Package_Shape_CN,Constraint_PackagedElementShape_CN,Enumeration_Shape_CN,DataType_Shape_CN"/> + <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Extension_Edge,Association_Edge,ProfileApplication_Edge,Association_BranchEdge,Generalization_Edge,Dependency_Edge,Dependency_BranchEdge,ElementImport_Edge,PackageImport_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,Constraint_ContextEdge"/> </viewProvider> </extension> @@ -395,71 +395,39 @@ <method name="getType()" value="PapyrusUMLProfileDiagram"/> </object> <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes"> - <method name="getType()" value="2014,2015,1026,2008,1031,1002,1014,2005,1030,2007,2006,2009,2010,2016,3026,3019,1037,3018,3002,3020,1023,3010,3028,1007,1027,1024,1012,1028,3025,3027"/> + <method name="getType()" value="Dependency_Shape,Association_Shape,Stereotype_Shape,Class_Shape,Class_MetaclassShape,Comment_Shape,Constraint_PackagedElementShape,Model_Shape,Profile_Shape,Package_Shape,Enumeration_Shape,PrimitiveType_Shape,DataType_Shape,Diagram_ShortcutShape,PrimitiveType_Shape_CN,Operation_DataTypeOperationLabel,EnumerationLiteral_LiteralLabel,Property_DataTypeAttributeLabel,Property_ClassAttributeLabel,Operation_ClassOperationLabel,Stereotype_Shape_CN,Class_Shape_CN,Class_MetaclassShape_CN,Comment_Shape_CN,Model_Shape_CN,Profile_Shape_CN,Package_Shape_CN,Constraint_PackagedElementShape_CN,Enumeration_Shape_CN,DataType_Shape_CN"/> </object> <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links"> - <method name="getType()" value="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014,8500"/> + <method name="getType()" value="Extension_Edge,Association_Edge,ProfileApplication_Edge,Association_BranchEdge,Generalization_Edge,Dependency_Edge,Dependency_BranchEdge,ElementImport_Edge,PackageImport_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,Constraint_ContextEdge"/> </object> <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels"> - <method name="getType()" value="1,1034,5029,1084,3,1015,5063,5020,1047,5026,5023,5032,5035,2,5058,1046,5014,5062,1008,1056,1050,1010,1059,5064,5055,5061"/> + <method name="getType()" value="Dependency_MultiNameLabel,Stereotype_NameLabel,Class_NameLabel,Class_MetaclassNameLabel,Comment_BodyLabel,Constraint_NameLabel,Constraint_BodyLabel,Model_NameLabel,Profile_NameLabel,Package_NameLabel,Enumeration_NameLabel,PrimitiveType_NameLabel,DataType_NameLabel,Diagram_NameLabel,PrimitiveType_NameLabel_CN,Stereotype_NameLabel_CN,Class_NameLabel_CN,Class_MetaclassNameLabel_CN,Comment_BodyLabel_CN,Model_NameLabel_CN,Profile_NameLabel_CN,Package_NameLabel_CN,Constraint_NameLabel_CN,Constraint_BodyLabel_CN,Enumeration_NameLabel_CN,DataType_NameLabel_CN"/> </object> <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments"> - <method name="getType()" value="1005,11,1042,1051,1071,1052,1019,1053,1057,1058,1062,1063,1067,1069,1068,1070,7017,7011,7018,7012"/> + <method name="getType()" value="Package_PackagedElementCompartment,Package_PackagedElementCompartment_CN,Profile_PackagedElementCompartment,Profile_PackagedElementCompartment_CN,Stereotype_AttributeCompartment,Stereotype_AttributeCompartment_CN,Stereotype_OperationCompartment,Stereotype_OperationCompartment_CN,Model_PackagedElementCompartment,Model_PackagedElementCompartment_CN,Enumeration_LiteralCompartment_CN,Enumeration_LiteralCompartment,DataType_AttributeCompartment,DataType_AttributeCompartment_CN,DataType_OperationCompartment,DataType_OperationCompartment_CN,Class_AttributeCompartment,Class_AttributeCompartment_CN,Class_OperationCompartment,Class_OperationCompartment_CN"/> </object> <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/> </editpartProvider> </extension> - <extension - id="ep-provider" - point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders"> - <editpartProvider - class="org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomUMLEditPartProvider"> - <Priority - name="Highest"> - </Priority> - <object - class="org.eclipse.gmf.runtime.notation.Diagram" - id="generated-diagram"> - <method - name="getType()" - value="PapyrusUMLProfileDiagram"> - </method> + <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider"> + <editpartProvider class="org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomUMLEditPartProvider"> + <Priority name="Highest"/> + <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram"> + <method name="getType()" value="PapyrusUMLProfileDiagram"/> </object> - <object - class="org.eclipse.gmf.runtime.notation.Node" - id="generated-nodes"> - <method - name="getType()" - value="2014,2015,1026,1031,1002,1014,2005,1030,2007,2006,2010,2016,3019,1037,3018,3002,3020,1023,3028,1007,1027,1024,1012,1028,3025,3027"> - </method> + <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes"> + <method name="getType()" value="Dependency_Shape,Association_Shape,Stereotype_Shape,Class_Shape,Class_MetaclassShape,Comment_Shape,Constraint_PackagedElementShape,Model_Shape,Profile_Shape,Package_Shape,Enumeration_Shape,PrimitiveType_Shape,DataType_Shape,Diagram_ShortcutShape,PrimitiveType_Shape_CN,Operation_DataTypeOperationLabel,EnumerationLiteral_LiteralLabel,Property_DataTypeAttributeLabel,Property_ClassAttributeLabel,Operation_ClassOperationLabel,Stereotype_Shape_CN,Class_Shape_CN,Class_MetaclassShape_CN,Comment_Shape_CN,Model_Shape_CN,Profile_Shape_CN,Package_Shape_CN,Constraint_PackagedElementShape_CN,Enumeration_Shape_CN,DataType_Shape_CN"/> </object> - <object - class="org.eclipse.gmf.runtime.notation.Edge" - id="generated-links"> - <method - name="getType()" - value="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014"> - </method> + <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links"> + <method name="getType()" value="Extension_Edge,Association_Edge,ProfileApplication_Edge,Association_BranchEdge,Generalization_Edge,Dependency_Edge,Dependency_BranchEdge,ElementImport_Edge,PackageImport_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,Constraint_ContextEdge"/> </object> - <object - class="org.eclipse.gmf.runtime.notation.Node" - id="generated-labels"> - <method - name="getType()" - value="1,1034,1084,3,1015,5020,1047,5026,5023,5035,2,1046,5062,1008,1056,1050,1010,1059,5055,5061"> - </method> + <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels"> + <method name="getType()" value="Dependency_MultiNameLabel,Stereotype_NameLabel,Class_NameLabel,Class_MetaclassNameLabel,Comment_BodyLabel,Constraint_NameLabel,Constraint_BodyLabel,Model_NameLabel,Profile_NameLabel,Package_NameLabel,Enumeration_NameLabel,PrimitiveType_NameLabel,DataType_NameLabel,Diagram_NameLabel,PrimitiveType_NameLabel_CN,Stereotype_NameLabel_CN,Class_NameLabel_CN,Class_MetaclassNameLabel_CN,Comment_BodyLabel_CN,Model_NameLabel_CN,Profile_NameLabel_CN,Package_NameLabel_CN,Constraint_NameLabel_CN,Constraint_BodyLabel_CN,Enumeration_NameLabel_CN,DataType_NameLabel_CN"/> </object> - <object - class="org.eclipse.gmf.runtime.notation.Node" - id="generated-compartments"> - <method - name="getType()" - value="1005,11,1042,1051,1071,1052,1019,1053,1057,1058,1062,1063,1067,1069,1068,1070"> - </method> + <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments"> + <method name="getType()" value="Package_PackagedElementCompartment,Package_PackagedElementCompartment_CN,Profile_PackagedElementCompartment,Profile_PackagedElementCompartment_CN,Stereotype_AttributeCompartment,Stereotype_AttributeCompartment_CN,Stereotype_OperationCompartment,Stereotype_OperationCompartment_CN,Model_PackagedElementCompartment,Model_PackagedElementCompartment_CN,Enumeration_LiteralCompartment_CN,Enumeration_LiteralCompartment,DataType_AttributeCompartment,DataType_AttributeCompartment_CN,DataType_OperationCompartment,DataType_OperationCompartment_CN,Class_AttributeCompartment,Class_AttributeCompartment_CN,Class_OperationCompartment,Class_OperationCompartment_CN"/> </object> - <context - views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"> - </context> + <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/> </editpartProvider> </extension> @@ -790,177 +758,148 @@ </Priority> </editpolicyProvider> </extension> -<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> - <diagramMappings diagramID="PapyrusUMLProfileDiagram"> - <mapping type="PapyrusUMLProfileDiagram" humanReadableType="ProfileDiagram"/> - - <mapping - humanReadableType="packaged elements" - type="1005"> - </mapping> - - <mapping - humanReadableType="packaged elements" - type="11"> - </mapping> - - <mapping - humanReadableType="packaged elements" - type="1042"> - </mapping> - - <mapping - humanReadableType="packaged elements" - type="1051"> - </mapping> - - <mapping - humanReadableType="attributes" - type="1071"> - </mapping> - - <mapping - humanReadableType="attributes" - type="1052"> - </mapping> - - <mapping - humanReadableType="operations" - type="1019"> - </mapping> - - <mapping - humanReadableType="operations" - type="1053"> - </mapping> - - <mapping - humanReadableType="packaged elements" - type="1057"> - </mapping> - - <mapping - humanReadableType="packaged elements" - type="1058"> - </mapping> - - <mapping - humanReadableType="literals" - type="1062"> - </mapping> - - <mapping - humanReadableType="literals" - type="1063"> - </mapping> - - <mapping - humanReadableType="attributes" - type="1067"> - </mapping> - - <mapping - humanReadableType="attributes" - type="1069"> - </mapping> - - <mapping - humanReadableType="operations" - type="1068"> - </mapping> - - <mapping - humanReadableType="operations" - type="1070"> - </mapping> - - - - - - <mapping - humanReadableType="Stereotype" - type="6001"> - </mapping> - - <mapping - humanReadableType="Name" - type="6002"> - </mapping> - - <mapping - humanReadableType="TargetRole" - type="6003"> - </mapping> - - <mapping - humanReadableType="SourceRole" - type="6005"> - </mapping> - - <mapping - humanReadableType="SourceMultiplicity" - type="6033"> - </mapping> - - <mapping - humanReadableType="TargetMultiplicity" - type="6034"> - </mapping> - - - - - - - - <mapping - humanReadableType="Stereotype" - type="6007"> - </mapping> - - - - <mapping - humanReadableType="Name" - type="6026"> - </mapping> - - <mapping - humanReadableType="Stereotype" - type="6027"> - </mapping> - - - - - - <mapping - humanReadableType="Alias" - type="6020"> - </mapping> - - <mapping - humanReadableType="Stereotype" - type="6021"> - </mapping> - - - - <mapping - humanReadableType="Stereotype" - type="6022"> - </mapping> - - - - - - - - - </diagramMappings> - </extension> +<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> + <?gmfgen generated="true"?> + <diagramMappings diagramID="PapyrusUMLProfileDiagram"> + <mapping type="PapyrusUMLProfileDiagram" humanReadableType="ProfileDiagram"/> + <mapping + humanReadableType="packaged elements" + type="Package_PackagedElementCompartment"> + </mapping> + <mapping + humanReadableType="packaged elements" + type="Package_PackagedElementCompartment_CN"> + </mapping> + <mapping + humanReadableType="packaged elements" + type="Profile_PackagedElementCompartment"> + </mapping> + <mapping + humanReadableType="packaged elements" + type="Profile_PackagedElementCompartment_CN"> + </mapping> + <mapping + humanReadableType="attributes" + type="Stereotype_AttributeCompartment"> + </mapping> + <mapping + humanReadableType="attributes" + type="Stereotype_AttributeCompartment_CN"> + </mapping> + <mapping + humanReadableType="operations" + type="Stereotype_OperationCompartment"> + </mapping> + <mapping + humanReadableType="operations" + type="Stereotype_OperationCompartment_CN"> + </mapping> + <mapping + humanReadableType="packaged elements" + type="Model_PackagedElementCompartment"> + </mapping> + <mapping + humanReadableType="packaged elements" + type="Model_PackagedElementCompartment_CN"> + </mapping> + <mapping + humanReadableType="literals" + type="Enumeration_LiteralCompartment_CN"> + </mapping> + <mapping + humanReadableType="literals" + type="Enumeration_LiteralCompartment"> + </mapping> + <mapping + humanReadableType="attributes" + type="DataType_AttributeCompartment"> + </mapping> + <mapping + humanReadableType="attributes" + type="DataType_AttributeCompartment_CN"> + </mapping> + <mapping + humanReadableType="operations" + type="DataType_OperationCompartment"> + </mapping> + <mapping + humanReadableType="operations" + type="DataType_OperationCompartment_CN"> + </mapping> + <mapping + humanReadableType="attributes" + type="Class_AttributeCompartment"> + </mapping> + <mapping + humanReadableType="attributes" + type="Class_AttributeCompartment_CN"> + </mapping> + <mapping + humanReadableType="operations" + type="Class_OperationCompartment"> + </mapping> + <mapping + humanReadableType="operations" + type="Class_OperationCompartment_CN"> + </mapping> + <mapping + humanReadableType="Stereotype" + type="Association_StereotypeLabel"> + </mapping> + <mapping + humanReadableType="Name" + type="Association_NameLabel"> + </mapping> + <mapping + humanReadableType="TargetRole" + type="Association_TargetRoleLabel"> + </mapping> + <mapping + humanReadableType="SourceRole" + type="Association_SourceRoleLabel"> + </mapping> + <mapping + humanReadableType="SourceMultiplicity" + type="Association_SourceMultiplicityLabel"> + </mapping> + <mapping + humanReadableType="TargetMultiplicity" + type="Association_TargetMultiplicityLabel"> + </mapping> + <mapping + humanReadableType="Stereotype" + type="Generalization_StereotypeLabel"> + </mapping> + <mapping + humanReadableType="Name" + type="Dependency_NameLabel"> + </mapping> + <mapping + humanReadableType="Stereotype" + type="Dependency_StereotypeLabel"> + </mapping> + <mapping + humanReadableType="Alias" + type="ElementImport_AliasLabel"> + </mapping> + <mapping + humanReadableType="Stereotype" + type="ElementImport_StereotypeLabel"> + </mapping> + <mapping + humanReadableType="Stereotype" + type="PackageImport_StereotypeLabel"> + </mapping> + <mapping + humanReadableType="Stereotype" + type="Constraint_KeywordLabel"> + </mapping> + <mapping + humanReadableType="Name" + type="Diagram_NameLabel"> + </mapping> + </diagramMappings> +</extension> <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders"> <ParserProvider @@ -971,13 +910,6 @@ </ParserProvider> </extension> <extension - point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> - <elementTypeSet - clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" - path="model/profilediagram.elementtypesconfigurations"> - </elementTypeSet> -</extension> -<extension point="org.eclipse.papyrus.infra.gmfdiag.assistant.modelProviders"> <modelProvider uri="model/profilediagram.assistants"></modelProvider> @@ -1016,5 +948,14 @@ diagramType="PapyrusUMLProfileDiagram"> </visualTypeProvider> </extension> +<extension + point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler"> + <diagramReconciler + diagramType="PapyrusUMLProfileDiagram" + reconcilerClass="org.eclipse.papyrus.uml.diagram.profile.custom.migration.ProfileReconciler_1_2_0" + source="1.1.0" + target="1.2.0"> + </diagramReconciler> +</extension> </plugin> 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 8d8577bf341..aca088e7930 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 @@ -103,7 +103,7 @@ public class ClassPropertyCreateCommand extends EditElementCommand { }
- ElementInitializers.getInstance().init_Property_3002(newElement);
+ ElementInitializers.getInstance().init_Property_ClassAttributeLabel(newElement);
doConfigure(newElement, monitor, info);
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 d7e04bc07d4..b8859bf9e82 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6021"; + public static final String VISUAL_ID = "ElementImport_StereotypeLabel"; /** * @generated @@ -127,7 +129,10 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), new Point(0, 60)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), + new Point(0, 60)); } /** @@ -160,12 +165,12 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -173,12 +178,12 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -186,12 +191,12 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -199,12 +204,12 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -262,10 +267,11 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -277,12 +283,12 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -290,10 +296,11 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -311,22 +318,28 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + AppliedStereotypeElementImportEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -337,10 +350,10 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -354,8 +367,8 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_1064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.ElementImport_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -364,8 +377,10 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -394,8 +409,8 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -403,8 +418,8 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -415,46 +430,58 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -476,12 +503,13 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -512,20 +540,20 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -533,15 +561,15 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -550,9 +578,9 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -561,9 +589,10 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,11 +610,11 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -597,8 +626,8 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -611,7 +640,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -637,13 +666,14 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -655,7 +685,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -677,12 +707,15 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -693,10 +726,13 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -715,12 +751,15 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -739,30 +778,34 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 29a9dfff10e..b10db8f5ed3 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6001"; + public static final String VISUAL_ID = "Association_StereotypeLabel"; /** * @generated @@ -127,7 +129,10 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID), + new Point(0, 60)); } /** @@ -160,12 +165,12 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -173,12 +178,12 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -186,12 +191,12 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -199,12 +204,12 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -262,10 +267,11 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -277,12 +283,12 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -290,10 +296,11 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -311,22 +318,28 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + AssociationAppliedStereotypeEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -337,10 +350,10 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -354,8 +367,8 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -364,8 +377,10 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -394,8 +409,8 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -403,8 +418,8 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -415,46 +430,58 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -476,12 +503,13 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -512,20 +540,20 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -533,15 +561,15 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -550,9 +578,9 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -561,9 +589,10 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,11 +610,11 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -597,8 +626,8 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -611,7 +640,7 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -648,7 +677,7 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -670,12 +699,15 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -686,10 +718,13 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -708,12 +743,15 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -732,30 +770,34 @@ public class AssociationAppliedStereotypeEditPart extends PapyrusLabelEditPart i @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 91c5aec78d4..029b4295508 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 @@ -30,7 +30,7 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart /** * @generated */ - public static final String VISUAL_ID = "4019"; + public static final String VISUAL_ID = "Association_BranchEdge"; /** * @generated @@ -53,11 +53,12 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof AssociationBranchRoleEditPart) { - ((AssociationBranchRoleEditPart)childEditPart).setLabel(getPrimaryShape().getRoleSourceLabel()); + if (childEditPart instanceof AssociationBranchRoleEditPart) { + ((AssociationBranchRoleEditPart) childEditPart).setLabel(getPrimaryShape().getRoleSourceLabel()); } - if(childEditPart instanceof AssociationBranchMultiplicityEditPart) { - ((AssociationBranchMultiplicityEditPart)childEditPart).setLabel(getPrimaryShape().getMultiplicitySourceLabel()); + if (childEditPart instanceof AssociationBranchMultiplicityEditPart) { + ((AssociationBranchMultiplicityEditPart) childEditPart) + .setLabel(getPrimaryShape().getMultiplicitySourceLabel()); } return false; } @@ -67,7 +68,7 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -77,10 +78,10 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof AssociationBranchRoleEditPart) { + if (childEditPart instanceof AssociationBranchRoleEditPart) { return true; } - if(childEditPart instanceof AssociationBranchMultiplicityEditPart) { + if (childEditPart instanceof AssociationBranchMultiplicityEditPart) { return true; } return false; @@ -91,7 +92,7 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -115,6 +116,6 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart */ @Override public AssociationFigure getPrimaryShape() { - return (AssociationFigure)getFigure(); + return (AssociationFigure) getFigure(); } } 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 0a21a0034bb..80278accce4 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetMultiplicityEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "6035"; + public static final String VISUAL_ID = "Association_BranchMultiplicityLabel"; /** * @generated @@ -127,7 +129,10 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart.VISUAL_ID), new Point(0, 20)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart.VISUAL_ID), + new Point(0, 20)); } /** @@ -146,7 +151,8 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetMultiplicityEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, + new DisplayAssociationEndTargetMultiplicityEditPolicy()); } /** @@ -161,12 +167,12 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -174,12 +180,12 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -187,12 +193,12 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -200,12 +206,12 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -263,10 +269,11 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -278,12 +285,12 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -291,10 +298,11 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -312,22 +320,28 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + AssociationBranchMultiplicityEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -338,10 +352,10 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -355,8 +369,8 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Association_BranchEdge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -365,8 +379,10 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -395,8 +411,8 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -404,8 +420,8 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -416,46 +432,58 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -477,12 +505,13 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -513,20 +542,20 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -534,15 +563,15 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -551,9 +580,9 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -562,9 +591,10 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -582,11 +612,11 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -598,8 +628,8 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -612,7 +642,7 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -649,7 +679,7 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -671,12 +701,15 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -687,10 +720,13 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -709,12 +745,15 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -733,30 +772,34 @@ public class AssociationBranchMultiplicityEditPart extends PapyrusLabelEditPart @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 16eb435a365..24373213e98 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "6024"; + public static final String VISUAL_ID = "Association_BranchRoleLabel"; /** * @generated @@ -127,7 +129,10 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), new Point(0, -20)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), + new Point(0, -20)); } /** @@ -146,7 +151,8 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, + new DisplayAssociationEndTargetEditPolicy()); } /** @@ -161,12 +167,12 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -174,12 +180,12 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -187,12 +193,12 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -200,12 +206,12 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -263,10 +269,11 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -278,12 +285,12 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -291,10 +298,11 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -312,22 +320,26 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), + AssociationBranchRoleEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -338,10 +350,10 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -355,8 +367,8 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Association_BranchEdge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -365,8 +377,10 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -395,8 +409,8 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -404,8 +418,8 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -416,46 +430,58 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -477,12 +503,13 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -513,20 +540,20 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -534,15 +561,15 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -551,9 +578,9 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -562,9 +589,10 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -582,11 +610,11 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -598,8 +626,8 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -612,7 +640,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -649,7 +677,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -671,12 +699,15 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -687,10 +718,13 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -709,12 +743,15 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -733,30 +770,34 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart implemen @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 2f42feca931..f05733c5d24 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 @@ -31,7 +31,7 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements /** * @generated */ - public static final String VISUAL_ID = "4001"; + public static final String VISUAL_ID = "Association_Edge"; /** * @generated @@ -47,7 +47,8 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -55,23 +56,26 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof AssociationAppliedStereotypeEditPart) { - ((AssociationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + if (childEditPart instanceof AssociationAppliedStereotypeEditPart) { + ((AssociationAppliedStereotypeEditPart) childEditPart) + .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); } - if(childEditPart instanceof AssociationNameEditPart) { - ((AssociationNameEditPart)childEditPart).setLabel(getPrimaryShape().getAssociationNameLabel()); + if (childEditPart instanceof AssociationNameEditPart) { + ((AssociationNameEditPart) childEditPart).setLabel(getPrimaryShape().getAssociationNameLabel()); } - if(childEditPart instanceof AssociationRoleTargetEditPart) { - ((AssociationRoleTargetEditPart)childEditPart).setLabel(getPrimaryShape().getRoleTargetLabel()); + if (childEditPart instanceof AssociationRoleTargetEditPart) { + ((AssociationRoleTargetEditPart) childEditPart).setLabel(getPrimaryShape().getRoleTargetLabel()); } - if(childEditPart instanceof AssociationRoleSourceEditPart) { - ((AssociationRoleSourceEditPart)childEditPart).setLabel(getPrimaryShape().getRoleSourceLabel()); + if (childEditPart instanceof AssociationRoleSourceEditPart) { + ((AssociationRoleSourceEditPart) childEditPart).setLabel(getPrimaryShape().getRoleSourceLabel()); } - if(childEditPart instanceof AssociationMultiplicitySourceEditPart) { - ((AssociationMultiplicitySourceEditPart)childEditPart).setLabel(getPrimaryShape().getMultiplicitySourceLabel()); + if (childEditPart instanceof AssociationMultiplicitySourceEditPart) { + ((AssociationMultiplicitySourceEditPart) childEditPart) + .setLabel(getPrimaryShape().getMultiplicitySourceLabel()); } - if(childEditPart instanceof AssociationMultiplicityTargetEditPart) { - ((AssociationMultiplicityTargetEditPart)childEditPart).setLabel(getPrimaryShape().getMultiplicityTargetLabel()); + if (childEditPart instanceof AssociationMultiplicityTargetEditPart) { + ((AssociationMultiplicityTargetEditPart) childEditPart) + .setLabel(getPrimaryShape().getMultiplicityTargetLabel()); } return false; } @@ -81,7 +85,7 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -91,22 +95,22 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof AssociationAppliedStereotypeEditPart) { + if (childEditPart instanceof AssociationAppliedStereotypeEditPart) { return true; } - if(childEditPart instanceof AssociationNameEditPart) { + if (childEditPart instanceof AssociationNameEditPart) { return true; } - if(childEditPart instanceof AssociationRoleTargetEditPart) { + if (childEditPart instanceof AssociationRoleTargetEditPart) { return true; } - if(childEditPart instanceof AssociationRoleSourceEditPart) { + if (childEditPart instanceof AssociationRoleSourceEditPart) { return true; } - if(childEditPart instanceof AssociationMultiplicitySourceEditPart) { + if (childEditPart instanceof AssociationMultiplicitySourceEditPart) { return true; } - if(childEditPart instanceof AssociationMultiplicityTargetEditPart) { + if (childEditPart instanceof AssociationMultiplicityTargetEditPart) { return true; } return false; @@ -117,7 +121,7 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -141,6 +145,6 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements */ @Override public AssociationFigure getPrimaryShape() { - return (AssociationFigure)getFigure(); + return (AssociationFigure) getFigure(); } } 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 eaea3355f43..b05949b4bec 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndSourceMultiplicityEditPolicy; @@ -84,12 +85,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6033"; + public static final String VISUAL_ID = "Association_SourceMultiplicityLabel"; /** * @generated @@ -128,7 +130,10 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), + new Point(0, 20)); } /** @@ -147,7 +152,8 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndSourceMultiplicityEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, + new DisplayAssociationEndSourceMultiplicityEditPolicy()); } /** @@ -162,12 +168,12 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -175,12 +181,12 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -188,12 +194,12 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -201,12 +207,12 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -264,10 +270,11 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -279,12 +286,12 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -292,10 +299,11 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -313,22 +321,28 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + AssociationMultiplicitySourceEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -339,10 +353,10 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -356,8 +370,8 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -366,8 +380,10 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -396,8 +412,8 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -405,8 +421,8 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -417,46 +433,58 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -478,12 +506,13 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -514,20 +543,20 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -535,15 +564,15 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -552,9 +581,9 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -563,9 +592,10 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -583,11 +613,11 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -599,8 +629,8 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -613,7 +643,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -639,13 +669,14 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -657,7 +688,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -679,12 +710,15 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -695,10 +729,13 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -717,12 +754,15 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -741,30 +781,34 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 6e5b02a1f31..44d59d2cfe6 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetMultiplicityEditPolicy; @@ -84,12 +85,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6034"; + public static final String VISUAL_ID = "Association_TargetMultiplicityLabel"; /** * @generated @@ -128,7 +130,10 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), new Point(0, -20)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), + new Point(0, -20)); } /** @@ -147,7 +152,8 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetMultiplicityEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, + new DisplayAssociationEndTargetMultiplicityEditPolicy()); } /** @@ -162,12 +168,12 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -175,12 +181,12 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -188,12 +194,12 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -201,12 +207,12 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -264,10 +270,11 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -279,12 +286,12 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -292,10 +299,11 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -313,22 +321,28 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + AssociationMultiplicityTargetEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -339,10 +353,10 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -356,8 +370,8 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -366,8 +380,10 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -396,8 +412,8 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -405,8 +421,8 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -417,46 +433,58 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -478,12 +506,13 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -514,20 +543,20 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -535,15 +564,15 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -552,9 +581,9 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -563,9 +592,10 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -583,11 +613,11 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -599,8 +629,8 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -613,7 +643,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -639,13 +669,14 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -657,7 +688,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -679,12 +710,15 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -695,10 +729,13 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -717,12 +754,15 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -741,30 +781,34 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 1ac5ff154b0..8b7c49ebd7f 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class AssociationNameEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6002"; + public static final String VISUAL_ID = "Association_NameLabel"; /** * @generated @@ -127,7 +129,10 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 20)); + registerSnapBackPosition( + UMLVisualIDRegistry + .getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart.VISUAL_ID), + new Point(0, 20)); } /** @@ -160,12 +165,12 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -173,12 +178,12 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -186,12 +191,12 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -199,12 +204,12 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -262,10 +267,11 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -277,12 +283,12 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -290,10 +296,11 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -311,22 +318,25 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), AssociationNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -337,10 +347,10 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -354,8 +364,8 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -364,8 +374,10 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -394,8 +406,8 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -403,8 +415,8 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -415,46 +427,58 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -476,12 +500,13 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -512,20 +537,20 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -533,15 +558,15 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -550,9 +575,9 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -561,9 +586,10 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,11 +607,11 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -597,8 +623,8 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -611,7 +637,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -637,13 +663,14 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -655,7 +682,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -677,12 +704,15 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -693,10 +723,13 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -715,12 +748,15 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -739,30 +775,34 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart implements ITe @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 32db82f7759..e125442079f 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 @@ -40,7 +40,7 @@ public class AssociationNodeEditPart extends NodeEditPart { /** * @generated */ - public static final String VISUAL_ID = "2015"; + public static final String VISUAL_ID = "Association_Shape"; /** * @generated @@ -66,7 +66,9 @@ public class AssociationNodeEditPart extends NodeEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -82,7 +84,7 @@ public class AssociationNodeEditPart extends NodeEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -116,7 +118,7 @@ public class AssociationNodeEditPart extends NodeEditPart { */ @Override public DiamondNode getPrimaryShape() { - return (DiamondNode)primaryShape; + return (DiamondNode) primaryShape; } /** @@ -139,6 +141,7 @@ public class AssociationNodeEditPart extends NodeEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -159,7 +162,7 @@ public class AssociationNodeEditPart extends NodeEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -170,7 +173,7 @@ public class AssociationNodeEditPart extends NodeEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -188,8 +191,8 @@ public class AssociationNodeEditPart extends NodeEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 2fa21bcc398..370c053d5b9 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndSourceEditPolicy; @@ -84,12 +85,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6005"; + public static final String VISUAL_ID = "Association_SourceRoleLabel"; /** * @generated @@ -128,7 +130,10 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart.VISUAL_ID), new Point(0, -20)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart.VISUAL_ID), + new Point(0, -20)); } /** @@ -147,7 +152,8 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndSourceEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, + new DisplayAssociationEndSourceEditPolicy()); } /** @@ -162,12 +168,12 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -175,12 +181,12 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -188,12 +194,12 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -201,12 +207,12 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -264,10 +270,11 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -279,12 +286,12 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -292,10 +299,11 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -313,22 +321,26 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), + AssociationRoleSourceEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -339,10 +351,10 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -356,8 +368,8 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -366,8 +378,10 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -396,8 +410,8 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -405,8 +419,8 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -417,46 +431,58 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -478,12 +504,13 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -514,20 +541,20 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -535,15 +562,15 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -552,9 +579,9 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -563,9 +590,10 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -583,11 +611,11 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -599,8 +627,8 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -613,7 +641,7 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -650,7 +678,7 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -672,12 +700,15 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -688,10 +719,13 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -710,12 +744,15 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -734,30 +771,34 @@ public class AssociationRoleSourceEditPart extends PapyrusLabelEditPart implemen @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 63b5593e2bb..7da63013f00 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.DisplayAssociationEndTargetEditPolicy; @@ -84,12 +85,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6003"; + public static final String VISUAL_ID = "Association_TargetRoleLabel"; /** * @generated @@ -128,7 +130,10 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart.VISUAL_ID), new Point(0, 20)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart.VISUAL_ID), + new Point(0, 20)); } /** @@ -147,7 +152,8 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new DisplayAssociationEndTargetEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, + new DisplayAssociationEndTargetEditPolicy()); } /** @@ -162,12 +168,12 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -175,12 +181,12 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -188,12 +194,12 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -201,12 +207,12 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -264,10 +270,11 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -279,12 +286,12 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -292,10 +299,11 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -313,22 +321,26 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), + AssociationRoleTargetEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -339,10 +351,10 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -356,8 +368,8 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -366,8 +378,10 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -396,8 +410,8 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -405,8 +419,8 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -417,46 +431,58 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -478,12 +504,13 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -514,20 +541,20 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -535,15 +562,15 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -552,9 +579,9 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -563,9 +590,10 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -583,11 +611,11 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -599,8 +627,8 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -613,7 +641,7 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -650,7 +678,7 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -672,12 +700,15 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -688,10 +719,13 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -710,12 +744,15 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -734,30 +771,34 @@ public class AssociationRoleTargetEditPart extends PapyrusLabelEditPart implemen @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassAttributeCompartmentEditPart.java index 65802eb6b92..ae869aeda42 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassAttributeCompartmentEditPart.java @@ -42,7 +42,7 @@ public class ClassAttributeCompartmentEditPart extends ListCompartmentEditPart { /** * @generated */ - public static final String VISUAL_ID = "7017"; + public static final String VISUAL_ID = "Class_AttributeCompartment"; /** * @generated @@ -88,7 +88,7 @@ public class ClassAttributeCompartmentEditPart extends ListCompartmentEditPart { */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -98,6 +98,7 @@ public class ClassAttributeCompartmentEditPart extends ListCompartmentEditPart { */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -107,7 +108,10 @@ public class ClassAttributeCompartmentEditPart extends ListCompartmentEditPart { @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -117,13 +121,13 @@ public class ClassAttributeCompartmentEditPart extends ListCompartmentEditPart { * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassAttributeCompartmentEditPartCN.java index 466f051e2c8..3ffeb0eff27 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassAttributeCompartmentEditPartCN.java @@ -42,7 +42,7 @@ public class ClassAttributeCompartmentEditPartCN extends ListCompartmentEditPart /** * @generated */ - public static final String VISUAL_ID = "7011"; + public static final String VISUAL_ID = "Class_AttributeCompartment_CN"; /** * @generated @@ -88,7 +88,7 @@ public class ClassAttributeCompartmentEditPartCN extends ListCompartmentEditPart */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -98,6 +98,7 @@ public class ClassAttributeCompartmentEditPartCN extends ListCompartmentEditPart */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -107,7 +108,10 @@ public class ClassAttributeCompartmentEditPartCN extends ListCompartmentEditPart @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -117,13 +121,13 @@ public class ClassAttributeCompartmentEditPartCN extends ListCompartmentEditPart * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 5d5e2405b7b..9c98e77609b 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 @@ -54,7 +54,7 @@ public class ClassEditPart extends ClassifierEditPart { /** * @generated */ - public static final String VISUAL_ID = "2008"; + public static final String VISUAL_ID = "Class_Shape"; /** * @generated @@ -81,13 +81,17 @@ public class ClassEditPart extends ClassifierEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -101,7 +105,7 @@ public class ClassEditPart extends ClassifierEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -128,6 +132,7 @@ public class ClassEditPart extends ClassifierEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -145,29 +150,32 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override public ClassFigure getPrimaryShape() { - return (ClassFigure)primaryShape; + return (ClassFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ClassNameEditPart) { - ((ClassNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ClassNameEditPart) { + ((ClassNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof ClassOperationCompartmentEditPart) { + + if (childEditPart instanceof ClassOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((ClassOperationCompartmentEditPart)childEditPart).getFigure()); + pane.add(((ClassOperationCompartmentEditPart) childEditPart).getFigure()); return true; } - if(childEditPart instanceof ClassAttributeCompartmentEditPart) { + + if (childEditPart instanceof ClassAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((ClassAttributeCompartmentEditPart)childEditPart).getFigure()); + pane.add(((ClassAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } + return false; } @@ -175,17 +183,17 @@ public class ClassEditPart extends ClassifierEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ClassNameEditPart) { + if (childEditPart instanceof ClassNameEditPart) { return true; } - if(childEditPart instanceof ClassOperationCompartmentEditPart) { + if (childEditPart instanceof ClassOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - pane.remove(((ClassOperationCompartmentEditPart)childEditPart).getFigure()); + pane.remove(((ClassOperationCompartmentEditPart) childEditPart).getFigure()); return true; } - if(childEditPart instanceof ClassAttributeCompartmentEditPart) { + if (childEditPart instanceof ClassAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - pane.remove(((ClassAttributeCompartmentEditPart)childEditPart).getFigure()); + pane.remove(((ClassAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } return false; @@ -196,7 +204,7 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -207,7 +215,7 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -218,10 +226,10 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof ClassOperationCompartmentEditPart) { + if (editPart instanceof ClassOperationCompartmentEditPart) { return getPrimaryShape().getOperationCompartmentFigure(); } - if(editPart instanceof ClassAttributeCompartmentEditPart) { + if (editPart instanceof ClassAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); } return getContentPane(); @@ -247,6 +255,7 @@ public class ClassEditPart extends ClassifierEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -259,7 +268,7 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -272,7 +281,7 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -283,7 +292,7 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -301,8 +310,8 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); + if (primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); } } @@ -319,13 +328,14 @@ public class ClassEditPart extends ClassifierEditPart { */ @Override public EditPart getTargetEditPart(Request request) { - if(request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); - IElementType type = (IElementType)adapter.getAdapter(IElementType.class); - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_3020)) { + if (request instanceof CreateViewAndElementRequest) { + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() + .getCreateElementRequestAdapter(); + IElementType type = (IElementType) adapter.getAdapter(IElementType.class); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_ClassOperationLabel)) { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID)); } - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Property_3002)) { + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ClassAttributeLabel)) { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID)); } } 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 4c07a8ddb93..6d9d397bf37 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 @@ -52,7 +52,7 @@ public class ClassEditPartCN extends ClassifierEditPart { /** * @generated */ - public static final String VISUAL_ID = "3010"; + public static final String VISUAL_ID = "Class_Shape_CN"; /** * @generated @@ -79,12 +79,15 @@ public class ClassEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -98,7 +101,7 @@ public class ClassEditPartCN extends ClassifierEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -125,6 +128,7 @@ public class ClassEditPartCN extends ClassifierEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -142,29 +146,32 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override public ClassFigure getPrimaryShape() { - return (ClassFigure)primaryShape; + return (ClassFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ClassNameEditPartCN) { - ((ClassNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ClassNameEditPartCN) { + ((ClassNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof ClassAttributeCompartmentEditPartCN) { + + if (childEditPart instanceof ClassAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((ClassAttributeCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((ClassAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } - if(childEditPart instanceof ClassOperationCompartmentEditPartCN) { + + if (childEditPart instanceof ClassOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((ClassOperationCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((ClassOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } + return false; } @@ -172,17 +179,17 @@ public class ClassEditPartCN extends ClassifierEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ClassNameEditPartCN) { + if (childEditPart instanceof ClassNameEditPartCN) { return true; } - if(childEditPart instanceof ClassAttributeCompartmentEditPartCN) { + if (childEditPart instanceof ClassAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - pane.remove(((ClassAttributeCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((ClassAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } - if(childEditPart instanceof ClassOperationCompartmentEditPartCN) { + if (childEditPart instanceof ClassOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - pane.remove(((ClassOperationCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((ClassOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } return false; @@ -193,7 +200,7 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -204,7 +211,7 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -215,10 +222,10 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof ClassAttributeCompartmentEditPartCN) { + if (editPart instanceof ClassAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); } - if(editPart instanceof ClassOperationCompartmentEditPartCN) { + if (editPart instanceof ClassOperationCompartmentEditPartCN) { return getPrimaryShape().getOperationCompartmentFigure(); } return getContentPane(); @@ -244,6 +251,7 @@ public class ClassEditPartCN extends ClassifierEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -256,7 +264,7 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -269,7 +277,7 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -280,7 +288,7 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -298,8 +306,8 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); + if (primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); } } @@ -316,14 +324,17 @@ public class ClassEditPartCN extends ClassifierEditPart { */ @Override public EditPart getTargetEditPart(Request request) { - if(request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); - IElementType type = (IElementType)adapter.getAdapter(IElementType.class); - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Property_3002)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID)); + if (request instanceof CreateViewAndElementRequest) { + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() + .getCreateElementRequestAdapter(); + IElementType type = (IElementType) adapter.getAdapter(IElementType.class); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ClassAttributeLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID)); } - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_3020)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID)); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_ClassOperationLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); 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 911bb36c039..13f5c9aa7e0 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 @@ -64,6 +64,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -85,12 +86,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ClassNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5029"; + public static final String VISUAL_ID = "Class_NameLabel"; /** * @generated @@ -148,12 +150,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -161,12 +163,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -174,12 +176,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -187,12 +189,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -242,12 +244,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe */ protected Image getLabelIcon() { EObject parserElement = getParserElement(); - if(parserElement == null) { + if (parserElement == null) { return null; } List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer()); - for(View view : views) { - if(AppearanceHelper.showElementIcon(view)) { + for (View view : views) { + if (AppearanceHelper.showElementIcon(view)) { return UMLElementTypes.getImage(parserElement.eClass()); } } @@ -260,10 +262,11 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -275,12 +278,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -288,10 +291,11 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -309,22 +313,26 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), ClassNameEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -335,10 +343,10 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -352,8 +360,8 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Class_2008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Class_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -362,8 +370,10 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -392,8 +402,8 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -401,8 +411,8 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -413,46 +423,58 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -474,12 +496,13 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -510,12 +533,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -524,12 +547,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -537,15 +560,15 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -554,9 +577,9 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -565,9 +588,10 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -585,11 +609,11 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -601,8 +625,8 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -615,7 +639,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -641,13 +665,14 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -659,7 +684,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -681,12 +706,15 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -697,10 +725,13 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -719,12 +750,15 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -762,31 +796,35 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON + .equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -819,7 +857,8 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -829,6 +868,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -836,5 +876,6 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 3d6f003dd6b..9385e563c5f 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ClassNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5014"; + public static final String VISUAL_ID = "Class_NameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ClassNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Class_3010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Class_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationCompartmentEditPart.java index 5eb2883d458..ba0536c0d22 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationCompartmentEditPart.java @@ -42,7 +42,7 @@ public class ClassOperationCompartmentEditPart extends ListCompartmentEditPart { /** * @generated */ - public static final String VISUAL_ID = "7018"; + public static final String VISUAL_ID = "Class_OperationCompartment"; /** * @generated @@ -88,7 +88,7 @@ public class ClassOperationCompartmentEditPart extends ListCompartmentEditPart { */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -98,6 +98,7 @@ public class ClassOperationCompartmentEditPart extends ListCompartmentEditPart { */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -107,7 +108,10 @@ public class ClassOperationCompartmentEditPart extends ListCompartmentEditPart { @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -117,13 +121,13 @@ public class ClassOperationCompartmentEditPart extends ListCompartmentEditPart { * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationCompartmentEditPartCN.java index c73d68db7fd..e73accbf370 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationCompartmentEditPartCN.java @@ -42,7 +42,7 @@ public class ClassOperationCompartmentEditPartCN extends ListCompartmentEditPart /** * @generated */ - public static final String VISUAL_ID = "7012"; + public static final String VISUAL_ID = "Class_OperationCompartment_CN"; /** * @generated @@ -88,7 +88,7 @@ public class ClassOperationCompartmentEditPartCN extends ListCompartmentEditPart */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -98,6 +98,7 @@ public class ClassOperationCompartmentEditPartCN extends ListCompartmentEditPart */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -107,7 +108,10 @@ public class ClassOperationCompartmentEditPartCN extends ListCompartmentEditPart @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -117,13 +121,13 @@ public class ClassOperationCompartmentEditPartCN extends ListCompartmentEditPart * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 3e0a0d0a9b2..2d808a8f77b 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 @@ -67,6 +67,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -92,12 +93,13 @@ import org.eclipse.uml2.uml.UMLPackage; /** * @generated */ -public class ClassOperationEditPart extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { +public class ClassOperationEditPart extends CompartmentEditPart + implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "3020"; + public static final String VISUAL_ID = "Operation_ClassOperationLabel"; /** * @generated @@ -145,7 +147,7 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText */ @Override public DragTracker getDragTracker(Request request) { - if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) { + if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; } return new DragEditPartsTrackerEx(this); @@ -161,7 +163,8 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeOperationDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy()); } @@ -169,12 +172,12 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -182,12 +185,12 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -195,12 +198,12 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -208,12 +211,12 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -271,10 +274,11 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -286,12 +290,12 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -299,10 +303,11 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -320,22 +325,25 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ClassOperationEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -346,10 +354,10 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -363,8 +371,9 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Operation_ClassOperationLabel, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -373,8 +382,10 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -403,8 +414,8 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -412,8 +423,8 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -424,46 +435,58 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -485,12 +508,13 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,12 +545,12 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -535,12 +559,12 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -548,15 +572,15 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -565,9 +589,9 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -576,9 +600,10 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,11 +621,11 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -612,8 +637,8 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -626,7 +651,7 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -652,13 +677,14 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -670,7 +696,7 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -692,12 +718,15 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -708,10 +737,13 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -730,12 +762,15 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -772,31 +807,34 @@ public class ClassOperationEditPart extends CompartmentEditPart implements IText @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { + if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { refreshUnderline(); } super.handleNotificationEvent(event); 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 b2f1ead4be6..ac9d4f0c70d 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 @@ -67,6 +67,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -92,12 +93,13 @@ import org.eclipse.uml2.uml.UMLPackage; /** * @generated */ -public class ClassPropertyEditPart extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { +public class ClassPropertyEditPart extends CompartmentEditPart + implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "3002"; + public static final String VISUAL_ID = "Property_ClassAttributeLabel"; /** * @generated @@ -145,7 +147,7 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA */ @Override public DragTracker getDragTracker(Request request) { - if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) { + if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; } return new DragEditPartsTrackerEx(this); @@ -161,7 +163,8 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypePropertyDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy()); } @@ -169,12 +172,12 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -182,12 +185,12 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -195,12 +198,12 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -208,12 +211,12 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -271,10 +274,11 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -286,12 +290,12 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -299,10 +303,11 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -320,22 +325,25 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ClassPropertyEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -346,10 +354,10 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -363,8 +371,9 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Property_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Property_ClassAttributeLabel, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -373,8 +382,10 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -403,8 +414,8 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -412,8 +423,8 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -424,46 +435,58 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -485,12 +508,13 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,12 +545,12 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -535,12 +559,12 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -548,15 +572,15 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -565,9 +589,9 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -576,9 +600,10 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,11 +621,11 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -612,8 +637,8 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -626,7 +651,7 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -652,13 +677,14 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -670,7 +696,7 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -692,12 +718,15 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -708,10 +737,13 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -730,12 +762,15 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -772,31 +807,34 @@ public class ClassPropertyEditPart extends CompartmentEditPart implements ITextA @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { + if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { refreshUnderline(); } super.handleNotificationEvent(event); 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 7faa7ce36dd..9e217c5f447 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 @@ -29,7 +29,7 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart i /** * @generated */ - public static final String VISUAL_ID = "1022"; + public static final String VISUAL_ID = "Comment_AnnotatedElementEdge"; /** * @generated @@ -65,6 +65,6 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart i * @generated */ public SimpleDashedEdgeFigure getPrimaryShape() { - return (SimpleDashedEdgeFigure)getFigure(); + return (SimpleDashedEdgeFigure) getFigure(); } } 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 2ecc5bf05c5..6fdcd7cfdb5 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class CommentBodyEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "3"; + public static final String VISUAL_ID = "Comment_BodyLabel"; /** * @generated @@ -144,12 +146,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), CommentBodyEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Comment_1002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Comment_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 09c1a62b09b..0bdc458837d 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1008"; + public static final String VISUAL_ID = "Comment_BodyLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), CommentBodyEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Comment_1007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Comment_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 f816fdafb88..d7a25135f05 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 @@ -46,7 +46,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ - public static final String VISUAL_ID = "1002"; + public static final String VISUAL_ID = "Comment_Shape"; /** * @generated @@ -72,10 +72,13 @@ public class CommentEditPart extends AbstractCommentEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -89,7 +92,7 @@ public class CommentEditPart extends AbstractCommentEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -116,6 +119,7 @@ public class CommentEditPart extends AbstractCommentEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -133,17 +137,18 @@ public class CommentEditPart extends AbstractCommentEditPart { */ @Override public HTMLCornerBentFigure getPrimaryShape() { - return (HTMLCornerBentFigure)primaryShape; + return (HTMLCornerBentFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof CommentBodyEditPart) { - ((CommentBodyEditPart)childEditPart).setLabel(getPrimaryShape().getCornerBentFigure()); + if (childEditPart instanceof CommentBodyEditPart) { + ((CommentBodyEditPart) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure()); return true; } + return false; } @@ -151,7 +156,7 @@ public class CommentEditPart extends AbstractCommentEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof CommentBodyEditPart) { + if (childEditPart instanceof CommentBodyEditPart) { return true; } return false; @@ -162,7 +167,7 @@ public class CommentEditPart extends AbstractCommentEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -173,7 +178,7 @@ public class CommentEditPart extends AbstractCommentEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -207,6 +212,7 @@ public class CommentEditPart extends AbstractCommentEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -219,7 +225,7 @@ public class CommentEditPart extends AbstractCommentEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -232,7 +238,7 @@ public class CommentEditPart extends AbstractCommentEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -243,7 +249,7 @@ public class CommentEditPart extends AbstractCommentEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -261,8 +267,8 @@ public class CommentEditPart extends AbstractCommentEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 f6f67cae1d5..361c8f2f64a 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 @@ -47,7 +47,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ - public static final String VISUAL_ID = "1007"; + public static final String VISUAL_ID = "Comment_Shape_CN"; /** * @generated @@ -73,10 +73,13 @@ public class CommentEditPartCN extends AbstractCommentEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -91,7 +94,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -118,6 +121,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -135,17 +139,18 @@ public class CommentEditPartCN extends AbstractCommentEditPart { */ @Override public HTMLCornerBentFigure getPrimaryShape() { - return (HTMLCornerBentFigure)primaryShape; + return (HTMLCornerBentFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof CommentBodyEditPartCN) { - ((CommentBodyEditPartCN)childEditPart).setLabel(getPrimaryShape().getCornerBentFigure()); + if (childEditPart instanceof CommentBodyEditPartCN) { + ((CommentBodyEditPartCN) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure()); return true; } + return false; } @@ -153,7 +158,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof CommentBodyEditPartCN) { + if (childEditPart instanceof CommentBodyEditPartCN) { return true; } return false; @@ -164,7 +169,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -175,7 +180,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -209,6 +214,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -221,7 +227,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -234,7 +240,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -245,7 +251,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -263,8 +269,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 c943b726928..3afdc823dc1 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5063"; + public static final String VISUAL_ID = "Constraint_BodyLabel"; /** * @generated @@ -144,12 +146,12 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ConstraintBodyEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,9 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBodyEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -348,8 +356,10 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +388,8 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +397,8 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +409,58 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +482,13 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +519,12 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +533,12 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +546,15 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +563,9 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +574,10 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +595,11 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +611,8 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +625,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +651,14 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +670,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +692,15 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +711,13 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +736,15 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +782,27 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +839,8 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +850,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +858,6 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart implement */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 290d1f7d8b3..c0729c58688 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5064"; + public static final String VISUAL_ID = "Constraint_BodyLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ConstraintBodyEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,9 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBodyEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape_CN, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -348,8 +356,10 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +388,8 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +397,8 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +409,58 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +482,13 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +519,12 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +533,12 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +546,15 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +563,9 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +574,10 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +595,11 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +611,8 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +625,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +651,14 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +670,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +692,15 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +711,13 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +736,15 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +782,27 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +839,8 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +850,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +858,6 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart impleme */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 87b90d14f07..084bcca6187 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 @@ -29,7 +29,7 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP /** * @generated */ - public static final String VISUAL_ID = "4014"; + public static final String VISUAL_ID = "Constraint_ConstrainedElementEdge"; /** * @generated @@ -65,6 +65,6 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP * @generated */ public SimpleDashedEdgeFigure getPrimaryShape() { - return (SimpleDashedEdgeFigure)getFigure(); + return (SimpleDashedEdgeFigure) getFigure(); } } 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 a033fef7f42..fdb78c491ea 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 @@ -46,7 +46,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ - public static final String VISUAL_ID = "1014"; + public static final String VISUAL_ID = "Constraint_PackagedElementShape"; /** * @generated @@ -72,11 +72,15 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -90,7 +94,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -117,6 +121,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -134,21 +139,22 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { */ @Override public ConstraintFigure getPrimaryShape() { - return (ConstraintFigure)primaryShape; + return (ConstraintFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ConstraintNameEditPart) { - ((ConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ConstraintNameEditPart) { + ((ConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof ConstraintBodyEditPart) { - ((ConstraintBodyEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure()); + if (childEditPart instanceof ConstraintBodyEditPart) { + ((ConstraintBodyEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure()); return true; } + return false; } @@ -156,10 +162,10 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ConstraintNameEditPart) { + if (childEditPart instanceof ConstraintNameEditPart) { return true; } - if(childEditPart instanceof ConstraintBodyEditPart) { + if (childEditPart instanceof ConstraintBodyEditPart) { return true; } return false; @@ -170,7 +176,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -181,7 +187,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -215,6 +221,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -227,7 +234,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -240,7 +247,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -251,7 +258,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -269,8 +276,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 ff3a068e5d3..6c434da3caa 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 @@ -44,7 +44,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ - public static final String VISUAL_ID = "1028"; + public static final String VISUAL_ID = "Constraint_PackagedElementShape_CN"; /** * @generated @@ -70,7 +70,9 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -86,7 +88,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -113,6 +115,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -130,21 +133,22 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { */ @Override public ConstraintFigure getPrimaryShape() { - return (ConstraintFigure)primaryShape; + return (ConstraintFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ConstraintNameEditPartCN) { - ((ConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ConstraintNameEditPartCN) { + ((ConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof ConstraintBodyEditPartCN) { - ((ConstraintBodyEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure()); + if (childEditPart instanceof ConstraintBodyEditPartCN) { + ((ConstraintBodyEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure()); return true; } + return false; } @@ -152,10 +156,10 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ConstraintNameEditPartCN) { + if (childEditPart instanceof ConstraintNameEditPartCN) { return true; } - if(childEditPart instanceof ConstraintBodyEditPartCN) { + if (childEditPart instanceof ConstraintBodyEditPartCN) { return true; } return false; @@ -166,7 +170,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -177,7 +181,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -211,6 +215,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -223,7 +228,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -236,7 +241,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -247,7 +252,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -265,8 +270,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 bd95b250428..7b62a3b098b 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ConstraintNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1015"; + public static final String VISUAL_ID = "Constraint_NameLabel"; /** * @generated @@ -144,12 +146,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ConstraintNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -348,8 +356,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +388,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +397,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +409,58 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +482,13 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +519,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +533,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +546,15 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +563,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +574,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +595,11 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +611,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +625,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +651,14 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +670,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +692,15 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +711,13 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +736,15 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +782,27 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +839,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +850,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +858,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 4ab0845d3e5..86251fd8721 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1059"; + public static final String VISUAL_ID = "Constraint_NameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ConstraintNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape_CN, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -348,8 +356,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +388,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +397,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +409,58 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +482,13 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +519,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +533,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +546,15 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +563,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +574,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +595,11 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +611,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +625,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +651,14 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +670,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +692,15 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +711,13 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +736,15 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +782,27 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +839,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +850,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +858,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ContextLinkAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ContextLinkAppliedStereotypeEditPart.java index db85352a243..6baa5f7179d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ContextLinkAppliedStereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ContextLinkAppliedStereotypeEditPart.java @@ -63,6 +63,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEd import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.NoSemanticParserEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -84,12 +85,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "8501"; + public static final String VISUAL_ID = "Constraint_KeywordLabel"; /** * @generated @@ -128,7 +130,10 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ContextLinkAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.ContextLinkAppliedStereotypeEditPart.VISUAL_ID), + new Point(0, 60)); } /** @@ -161,12 +166,12 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -174,12 +179,12 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -187,12 +192,12 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -200,12 +205,12 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -261,10 +266,11 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -276,12 +282,12 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -289,10 +295,11 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -310,22 +317,28 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + ContextLinkAppliedStereotypeEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -336,10 +349,10 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -353,8 +366,8 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.ConstraintContext_8500, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ContextLinkAppliedStereotypeEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Constraint_ContextEdge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -363,8 +376,10 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -393,8 +408,8 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -402,8 +417,8 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -413,46 +428,58 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -474,12 +501,13 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -509,20 +537,20 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -530,15 +558,15 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -547,9 +575,9 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -557,9 +585,10 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -575,11 +604,11 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -590,8 +619,8 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -603,7 +632,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -640,7 +669,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -662,12 +691,15 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -678,10 +710,13 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -700,12 +735,15 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -723,30 +761,34 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart i */ protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 f0bdd5a6852..45ce0dc9906 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 @@ -33,7 +33,7 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ - public static final String VISUAL_ID = "8500"; + public static final String VISUAL_ID = "Constraint_ContextEdge"; /** * @generated @@ -50,7 +50,8 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ContextLinkSemanticEditPolicy()); } @@ -58,8 +59,9 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ContextLinkAppliedStereotypeEditPart) { - ((ContextLinkAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + if (childEditPart instanceof ContextLinkAppliedStereotypeEditPart) { + ((ContextLinkAppliedStereotypeEditPart) childEditPart) + .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -68,7 +70,7 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT * @generated */ protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -78,7 +80,7 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ContextLinkAppliedStereotypeEditPart) { + if (childEditPart instanceof ContextLinkAppliedStereotypeEditPart) { return true; } return false; @@ -88,7 +90,7 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT * @generated */ protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -111,6 +113,6 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT * @generated */ public CustomContextLinkFigure getPrimaryShape() { - return (CustomContextLinkFigure)getFigure(); + return (CustomContextLinkFigure) getFigure(); } } 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 c0ef3ff3b95..484815adbba 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 @@ -41,7 +41,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm /** * @generated */ - public static final String VISUAL_ID = "1067"; + public static final String VISUAL_ID = "DataType_AttributeCompartment"; /** * @generated @@ -86,7 +86,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 b2ba07cd9be..a1223f9f5ae 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 @@ -41,7 +41,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ - public static final String VISUAL_ID = "1069"; + public static final String VISUAL_ID = "DataType_AttributeCompartment_CN"; /** * @generated @@ -86,7 +86,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 9458d20fe20..889115cdbc1 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 @@ -54,7 +54,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ - public static final String VISUAL_ID = "2010"; + public static final String VISUAL_ID = "DataType_Shape"; /** * @generated @@ -81,13 +81,17 @@ public class DataTypeEditPart extends ClassifierEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -101,7 +105,7 @@ public class DataTypeEditPart extends ClassifierEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -128,6 +132,7 @@ public class DataTypeEditPart extends ClassifierEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -145,29 +150,32 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override public DataTypeFigure getPrimaryShape() { - return (DataTypeFigure)primaryShape; + return (DataTypeFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof DataTypeNameEditPart) { - ((DataTypeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof DataTypeNameEditPart) { + ((DataTypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof DataTypeAttributeCompartmentEditPart) { + + if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((DataTypeAttributeCompartmentEditPart)childEditPart).getFigure()); + pane.add(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } - if(childEditPart instanceof DataTypeOperationCompartmentEditPart) { + + if (childEditPart instanceof DataTypeOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((DataTypeOperationCompartmentEditPart)childEditPart).getFigure()); + pane.add(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure()); return true; } + return false; } @@ -175,17 +183,17 @@ public class DataTypeEditPart extends ClassifierEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof DataTypeNameEditPart) { + if (childEditPart instanceof DataTypeNameEditPart) { return true; } - if(childEditPart instanceof DataTypeAttributeCompartmentEditPart) { + if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - pane.remove(((DataTypeAttributeCompartmentEditPart)childEditPart).getFigure()); + pane.remove(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } - if(childEditPart instanceof DataTypeOperationCompartmentEditPart) { + if (childEditPart instanceof DataTypeOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - pane.remove(((DataTypeOperationCompartmentEditPart)childEditPart).getFigure()); + pane.remove(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure()); return true; } return false; @@ -196,7 +204,7 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -207,7 +215,7 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -218,10 +226,10 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof DataTypeAttributeCompartmentEditPart) { + if (editPart instanceof DataTypeAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); } - if(editPart instanceof DataTypeOperationCompartmentEditPart) { + if (editPart instanceof DataTypeOperationCompartmentEditPart) { return getPrimaryShape().getOperationCompartmentFigure(); } return getContentPane(); @@ -247,6 +255,7 @@ public class DataTypeEditPart extends ClassifierEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -259,7 +268,7 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -272,7 +281,7 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -283,7 +292,7 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -301,8 +310,8 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); + if (primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); } } @@ -319,14 +328,17 @@ public class DataTypeEditPart extends ClassifierEditPart { */ @Override public EditPart getTargetEditPart(Request request) { - if(request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); - IElementType type = (IElementType)adapter.getAdapter(IElementType.class); - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Property_3018)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID)); + if (request instanceof CreateViewAndElementRequest) { + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() + .getCreateElementRequestAdapter(); + IElementType type = (IElementType) adapter.getAdapter(IElementType.class); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_DataTypeAttributeLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID)); } - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_3019)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID)); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_DataTypeOperationLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); 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 79a640a2004..23d73972a31 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 @@ -52,7 +52,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ - public static final String VISUAL_ID = "3027"; + public static final String VISUAL_ID = "DataType_Shape_CN"; /** * @generated @@ -79,12 +79,15 @@ public class DataTypeEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -98,7 +101,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -125,6 +128,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -142,29 +146,32 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override public DataTypeFigure getPrimaryShape() { - return (DataTypeFigure)primaryShape; + return (DataTypeFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof DataTypeNameEditPartCN) { - ((DataTypeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof DataTypeNameEditPartCN) { + ((DataTypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) { + + if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((DataTypeAttributeCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } - if(childEditPart instanceof DataTypeOperationCompartmentEditPartCN) { + + if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((DataTypeOperationCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } + return false; } @@ -172,17 +179,17 @@ public class DataTypeEditPartCN extends ClassifierEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof DataTypeNameEditPartCN) { + if (childEditPart instanceof DataTypeNameEditPartCN) { return true; } - if(childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) { + if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - pane.remove(((DataTypeAttributeCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } - if(childEditPart instanceof DataTypeOperationCompartmentEditPartCN) { + if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - pane.remove(((DataTypeOperationCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } return false; @@ -193,7 +200,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -204,7 +211,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -215,10 +222,10 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof DataTypeAttributeCompartmentEditPartCN) { + if (editPart instanceof DataTypeAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); } - if(editPart instanceof DataTypeOperationCompartmentEditPartCN) { + if (editPart instanceof DataTypeOperationCompartmentEditPartCN) { return getPrimaryShape().getOperationCompartmentFigure(); } return getContentPane(); @@ -244,6 +251,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -256,7 +264,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -269,7 +277,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -280,7 +288,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -298,8 +306,8 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); + if (primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); } } @@ -316,14 +324,17 @@ public class DataTypeEditPartCN extends ClassifierEditPart { */ @Override public EditPart getTargetEditPart(Request request) { - if(request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); - IElementType type = (IElementType)adapter.getAdapter(IElementType.class); - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Property_3018)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID)); + if (request instanceof CreateViewAndElementRequest) { + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() + .getCreateElementRequestAdapter(); + IElementType type = (IElementType) adapter.getAdapter(IElementType.class); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_DataTypeAttributeLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID)); } - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_3019)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID)); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_DataTypeOperationLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); 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 ad1f32c6b57..6e075d219dd 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class DataTypeNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5035"; + public static final String VISUAL_ID = "DataType_NameLabel"; /** * @generated @@ -144,12 +146,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), DataTypeNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.DataType_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 84ae3ca1adf..c7e12727ccb 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5061"; + public static final String VISUAL_ID = "DataType_NameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), DataTypeNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.DataType_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 17aae714709..4caf48626ee 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 @@ -41,7 +41,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm /** * @generated */ - public static final String VISUAL_ID = "1068"; + public static final String VISUAL_ID = "DataType_OperationCompartment"; /** * @generated @@ -86,7 +86,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 b013f7b7cd1..70381884966 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 @@ -41,7 +41,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ - public static final String VISUAL_ID = "1070"; + public static final String VISUAL_ID = "DataType_OperationCompartment_CN"; /** * @generated @@ -86,7 +86,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 a0d6f7220ca..f5c1432bc65 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 @@ -67,6 +67,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -92,12 +93,13 @@ import org.eclipse.uml2.uml.UMLPackage; /** * @generated */ -public class DataTypeOperationEditPart extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { +public class DataTypeOperationEditPart extends CompartmentEditPart + implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "3019"; + public static final String VISUAL_ID = "Operation_DataTypeOperationLabel"; /** * @generated @@ -145,7 +147,7 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT */ @Override public DragTracker getDragTracker(Request request) { - if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) { + if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; } return new DragEditPartsTrackerEx(this); @@ -161,7 +163,8 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeOperationDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy()); } @@ -169,12 +172,12 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -182,12 +185,12 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -195,12 +198,12 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -208,12 +211,12 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -271,10 +274,11 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -286,12 +290,12 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -299,10 +303,11 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -320,22 +325,25 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), DataTypeOperationEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -346,10 +354,10 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -363,8 +371,9 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Operation_DataTypeOperationLabel, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -373,8 +382,10 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -403,8 +414,8 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -412,8 +423,8 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -424,46 +435,58 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -485,12 +508,13 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,12 +545,12 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -535,12 +559,12 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -548,15 +572,15 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -565,9 +589,9 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -576,9 +600,10 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,11 +621,11 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -612,8 +637,8 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -626,7 +651,7 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -652,13 +677,14 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -670,7 +696,7 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -692,12 +718,15 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -708,10 +737,13 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -730,12 +762,15 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -772,31 +807,34 @@ public class DataTypeOperationEditPart extends CompartmentEditPart implements IT @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { + if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { refreshUnderline(); } super.handleNotificationEvent(event); 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 e98ff1931aa..00ca81b0c8e 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 @@ -67,6 +67,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -92,12 +93,13 @@ import org.eclipse.uml2.uml.UMLPackage; /** * @generated */ -public class DataTypePropertyEditPart extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { +public class DataTypePropertyEditPart extends CompartmentEditPart + implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "3018"; + public static final String VISUAL_ID = "Property_DataTypeAttributeLabel"; /** * @generated @@ -145,7 +147,7 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe */ @Override public DragTracker getDragTracker(Request request) { - if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) { + if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; } return new DragEditPartsTrackerEx(this); @@ -161,7 +163,8 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypePropertyDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy()); } @@ -169,12 +172,12 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -182,12 +185,12 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -195,12 +198,12 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -208,12 +211,12 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -271,10 +274,11 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -286,12 +290,12 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -299,10 +303,11 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -320,22 +325,25 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), DataTypePropertyEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -346,10 +354,10 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -363,8 +371,9 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Property_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Property_DataTypeAttributeLabel, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -373,8 +382,10 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -403,8 +414,8 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -412,8 +423,8 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -424,46 +435,58 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -485,12 +508,13 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,12 +545,12 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -535,12 +559,12 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -548,15 +572,15 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -565,9 +589,9 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -576,9 +600,10 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,11 +621,11 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -612,8 +637,8 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -626,7 +651,7 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -652,13 +677,14 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -670,7 +696,7 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -692,12 +718,15 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -708,10 +737,13 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -730,12 +762,15 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -772,31 +807,34 @@ public class DataTypePropertyEditPart extends CompartmentEditPart implements ITe @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { + if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { refreshUnderline(); } super.handleNotificationEvent(event); 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 ff84c40a30a..6636f9962a0 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6027"; + public static final String VISUAL_ID = "Dependency_StereotypeLabel"; /** * @generated @@ -127,7 +129,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), + new Point(0, 60)); } /** @@ -160,12 +165,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -173,12 +178,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -186,12 +191,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -199,12 +204,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -262,10 +267,11 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -277,12 +283,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -290,10 +296,11 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -311,22 +318,28 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + DependencyAppliedStereotypeEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -337,10 +350,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -354,8 +367,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Dependency_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -364,8 +377,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -394,8 +409,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -403,8 +418,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -415,46 +430,58 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -476,12 +503,13 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -512,20 +540,20 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -533,15 +561,15 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -550,9 +578,9 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -561,9 +589,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,11 +610,11 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -597,8 +626,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -611,7 +640,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -648,7 +677,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -670,12 +699,15 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -686,10 +718,13 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -708,12 +743,15 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -732,30 +770,34 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 73ca275746d..a1da577e891 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 @@ -29,7 +29,7 @@ public class DependencyBranchEditPart extends ConnectionEditPart implements ITre /** * @generated */ - public static final String VISUAL_ID = "4018"; + public static final String VISUAL_ID = "Dependency_BranchEdge"; /** * @generated @@ -65,6 +65,6 @@ public class DependencyBranchEditPart extends ConnectionEditPart implements ITre * @generated */ public DashedEdgeFigure getPrimaryShape() { - return (DashedEdgeFigure)getFigure(); + return (DashedEdgeFigure) getFigure(); } } 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 3d9a3e790df..0284cb234ff 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 @@ -31,7 +31,7 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr /** * @generated */ - public static final String VISUAL_ID = "4008"; + public static final String VISUAL_ID = "Dependency_Edge"; /** * @generated @@ -47,7 +47,8 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -55,11 +56,12 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof DependencyNameEditPart) { - ((DependencyNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof DependencyNameEditPart) { + ((DependencyNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); } - if(childEditPart instanceof DependencyAppliedStereotypeEditPart) { - ((DependencyAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + if (childEditPart instanceof DependencyAppliedStereotypeEditPart) { + ((DependencyAppliedStereotypeEditPart) childEditPart) + .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -69,7 +71,7 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -79,10 +81,10 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof DependencyNameEditPart) { + if (childEditPart instanceof DependencyNameEditPart) { return true; } - if(childEditPart instanceof DependencyAppliedStereotypeEditPart) { + if (childEditPart instanceof DependencyAppliedStereotypeEditPart) { return true; } return false; @@ -93,7 +95,7 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -117,6 +119,6 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr */ @Override public DashedEdgeFigure getPrimaryShape() { - return (DashedEdgeFigure)getFigure(); + return (DashedEdgeFigure) getFigure(); } } 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 15803371bb6..bee30a6b707 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class DependencyNameEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6026"; + public static final String VISUAL_ID = "Dependency_NameLabel"; /** * @generated @@ -127,7 +129,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40)); + registerSnapBackPosition( + UMLVisualIDRegistry + .getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart.VISUAL_ID), + new Point(0, 40)); } /** @@ -160,12 +165,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -173,12 +178,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -186,12 +191,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -199,12 +204,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -262,10 +267,11 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -277,12 +283,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -290,10 +296,11 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -311,22 +318,25 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), DependencyNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -337,10 +347,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -354,8 +364,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Dependency_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -364,8 +374,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -394,8 +406,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -403,8 +415,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -415,46 +427,58 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -476,12 +500,13 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -512,20 +537,20 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -533,15 +558,15 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -550,9 +575,9 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -561,9 +586,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,11 +607,11 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -597,8 +623,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -611,7 +637,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -637,13 +663,14 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -655,7 +682,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -677,12 +704,15 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -693,10 +723,13 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -715,12 +748,15 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -739,30 +775,34 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 7ea6c5a7751..d2d236f45d2 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 @@ -51,7 +51,7 @@ public class DependencyNodeEditPart extends NodeEditPart { /** * @generated */ - public static final String VISUAL_ID = "2014"; + public static final String VISUAL_ID = "Dependency_Shape"; /** * @generated @@ -77,7 +77,9 @@ public class DependencyNodeEditPart extends NodeEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -92,16 +94,16 @@ public class DependencyNodeEditPart extends NodeEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { - View childView = (View)child.getModel(); + View childView = (View) child.getModel(); String vid = UMLVisualIDRegistry.getVisualID(childView); - if(vid != null) { - switch(vid) { + if (vid != null) { + switch (vid) { case MultiDependencyLabelEditPart.VISUAL_ID: return new BorderItemSelectionEditPolicy() { @Override protected List<?> createSelectionHandles() { - MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost()); + MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost()); mh.setBorder(null); return Collections.singletonList(mh); } @@ -109,7 +111,7 @@ public class DependencyNodeEditPart extends NodeEditPart { } } EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -143,7 +145,7 @@ public class DependencyNodeEditPart extends NodeEditPart { */ @Override public DependencyNodeFigure getPrimaryShape() { - return (DependencyNodeFigure)primaryShape; + return (DependencyNodeFigure) primaryShape; } /** @@ -151,7 +153,7 @@ public class DependencyNodeEditPart extends NodeEditPart { */ @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { - if(borderItemEditPart instanceof MultiDependencyLabelEditPart) { + if (borderItemEditPart instanceof MultiDependencyLabelEditPart) { BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH); locator.setBorderItemOffset(new Dimension(-20, -20)); borderItemContainer.add(borderItemEditPart.getFigure(), locator); @@ -180,6 +182,7 @@ public class DependencyNodeEditPart extends NodeEditPart { @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -200,7 +203,7 @@ public class DependencyNodeEditPart extends NodeEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -211,7 +214,7 @@ public class DependencyNodeEditPart extends NodeEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -229,8 +232,8 @@ public class DependencyNodeEditPart extends NodeEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 f8eb12285c0..c480bdaa4ef 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 @@ -63,6 +63,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -84,12 +85,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider { +public class DiagramNameEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "2"; + public static final String VISUAL_ID = "Diagram_NameLabel"; /** * @generated @@ -128,7 +130,10 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0)); + registerSnapBackPosition( + UMLVisualIDRegistry + .getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart.VISUAL_ID), + new Point(0, 0)); } /** @@ -155,9 +160,9 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); - if(parentFigure != null && parentFigure.getLayoutManager() != null) { + if (parentFigure != null && parentFigure.getLayoutManager() != null) { Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure()); - return (IBorderItemLocator)constraint; + return (IBorderItemLocator) constraint; } return null; } @@ -167,10 +172,10 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw */ @Override public void refreshBounds() { - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height)); } @@ -178,12 +183,12 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -191,12 +196,12 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -204,12 +209,12 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -217,12 +222,12 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -280,10 +285,11 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -295,12 +301,12 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -308,10 +314,11 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -329,22 +336,25 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), DiagramNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -355,10 +365,10 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -372,8 +382,8 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Diagram_2016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Diagram_ShortcutShape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -382,8 +392,10 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -412,8 +424,8 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -421,8 +433,8 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -433,46 +445,58 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -494,12 +518,13 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -530,20 +555,20 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -551,15 +576,15 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -568,9 +593,9 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -579,9 +604,10 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -599,11 +625,11 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -615,8 +641,8 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -629,7 +655,7 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -655,13 +681,14 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -673,7 +700,7 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -695,12 +722,15 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -711,10 +741,13 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -733,12 +766,15 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -757,24 +793,27 @@ public class DiagramNameEditPart extends PapyrusLabelEditPart implements ITextAw @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); 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 786b0c7dcf6..fd2884c4cc5 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class ElementImportAliasEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6020"; + public static final String VISUAL_ID = "ElementImport_AliasLabel"; /** * @generated @@ -127,7 +129,10 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart.VISUAL_ID), new Point(0, 40)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart.VISUAL_ID), + new Point(0, 40)); } /** @@ -160,12 +165,12 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -173,12 +178,12 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -186,12 +191,12 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -199,12 +204,12 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -262,10 +267,11 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -277,12 +283,12 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -290,10 +296,11 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -311,22 +318,25 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ElementImportAliasEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -337,10 +347,10 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -354,8 +364,8 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_1064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.ElementImport_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -364,8 +374,10 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -394,8 +406,8 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -403,8 +415,8 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -415,46 +427,58 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -476,12 +500,13 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -512,20 +537,20 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -533,15 +558,15 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -550,9 +575,9 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -561,9 +586,10 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,11 +607,11 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -597,8 +623,8 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -611,7 +637,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -637,13 +663,14 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -655,7 +682,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -677,12 +704,15 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -693,10 +723,13 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -715,12 +748,15 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -739,30 +775,34 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart implements @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 fa7c493a77b..60fd701bb98 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 @@ -32,7 +32,7 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ - public static final String VISUAL_ID = "1064"; + public static final String VISUAL_ID = "ElementImport_Edge"; /** * @generated @@ -49,18 +49,20 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeLinkLabelDisplayEditPolicy()); } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ElementImportAliasEditPart) { - ((ElementImportAliasEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ElementImportAliasEditPart) { + ((ElementImportAliasEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); } - if(childEditPart instanceof AppliedStereotypeElementImportEditPart) { - ((AppliedStereotypeElementImportEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + if (childEditPart instanceof AppliedStereotypeElementImportEditPart) { + ((AppliedStereotypeElementImportEditPart) childEditPart) + .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -70,7 +72,7 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -80,10 +82,10 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ElementImportAliasEditPart) { + if (childEditPart instanceof ElementImportAliasEditPart) { return true; } - if(childEditPart instanceof AppliedStereotypeElementImportEditPart) { + if (childEditPart instanceof AppliedStereotypeElementImportEditPart) { return true; } return false; @@ -94,7 +96,7 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -118,6 +120,6 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements */ @Override public DashedEdgeFigure getPrimaryShape() { - return (DashedEdgeFigure)getFigure(); + return (DashedEdgeFigure) getFigure(); } } 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 98b720c6f48..49938ab09eb 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 @@ -55,7 +55,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ - public static final String VISUAL_ID = "2006"; + public static final String VISUAL_ID = "Enumeration_Shape"; /** * @generated @@ -82,14 +82,19 @@ public class EnumerationEditPart extends ClassifierEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, + new ShowHideClassifierContentsEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -103,7 +108,7 @@ public class EnumerationEditPart extends ClassifierEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -130,6 +135,7 @@ public class EnumerationEditPart extends ClassifierEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -147,23 +153,25 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override public EnumerationFigure getPrimaryShape() { - return (EnumerationFigure)primaryShape; + return (EnumerationFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof EnumerationNameEditPart) { - ((EnumerationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof EnumerationNameEditPart) { + ((EnumerationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) { + + if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) { IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((EnumerationEnumerationLiteralCompartmentEditPart)childEditPart).getFigure()); + pane.add(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure()); return true; } + return false; } @@ -171,12 +179,12 @@ public class EnumerationEditPart extends ClassifierEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof EnumerationNameEditPart) { + if (childEditPart instanceof EnumerationNameEditPart) { return true; } - if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) { + if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) { IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure(); - pane.remove(((EnumerationEnumerationLiteralCompartmentEditPart)childEditPart).getFigure()); + pane.remove(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure()); return true; } return false; @@ -187,7 +195,7 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -198,7 +206,7 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -209,7 +217,7 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) { + if (editPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) { return getPrimaryShape().getEnumerationLiteralCompartmentFigure(); } return getContentPane(); @@ -235,6 +243,7 @@ public class EnumerationEditPart extends ClassifierEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -247,7 +256,7 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -260,7 +269,7 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -271,7 +280,7 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -289,8 +298,8 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); + if (primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); } } @@ -307,11 +316,13 @@ public class EnumerationEditPart extends ClassifierEditPart { */ @Override public EditPart getTargetEditPart(Request request) { - if(request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); - IElementType type = (IElementType)adapter.getAdapter(IElementType.class); - if(UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_1037)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID)); + if (request instanceof CreateViewAndElementRequest) { + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() + .getCreateElementRequestAdapter(); + IElementType type = (IElementType) adapter.getAdapter(IElementType.class); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_LiteralLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); 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 f88fbd99e61..ea2396e3357 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 @@ -54,7 +54,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ - public static final String VISUAL_ID = "3025"; + public static final String VISUAL_ID = "Enumeration_Shape_CN"; /** * @generated @@ -81,13 +81,18 @@ public class EnumerationEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, + new ShowHideClassifierContentsEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -101,7 +106,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -128,6 +133,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -145,23 +151,25 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override public EnumerationFigure getPrimaryShape() { - return (EnumerationFigure)primaryShape; + return (EnumerationFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof EnumerationNameEditPartCN) { - ((EnumerationNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof EnumerationNameEditPartCN) { + ((EnumerationNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) { + + if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure()); return true; } + return false; } @@ -169,12 +177,12 @@ public class EnumerationEditPartCN extends ClassifierEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof EnumerationNameEditPartCN) { + if (childEditPart instanceof EnumerationNameEditPartCN) { return true; } - if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) { + if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure(); - pane.remove(((EnumerationEnumerationLiteralCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure()); return true; } return false; @@ -185,7 +193,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -196,7 +204,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -207,7 +215,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) { + if (editPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) { return getPrimaryShape().getEnumerationLiteralCompartmentFigure(); } return getContentPane(); @@ -233,6 +241,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -245,7 +254,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -258,7 +267,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -269,7 +278,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -287,8 +296,8 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); + if (primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); } } @@ -305,11 +314,13 @@ public class EnumerationEditPartCN extends ClassifierEditPart { */ @Override public EditPart getTargetEditPart(Request request) { - if(request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); - IElementType type = (IElementType)adapter.getAdapter(IElementType.class); - if(UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_1037)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID)); + if (request instanceof CreateViewAndElementRequest) { + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() + .getCreateElementRequestAdapter(); + IElementType type = (IElementType) adapter.getAdapter(IElementType.class); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_LiteralLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); 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 7a11a16460d..7b3626c5898 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 @@ -41,7 +41,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends Resizeable /** * @generated */ - public static final String VISUAL_ID = "1063"; + public static final String VISUAL_ID = "Enumeration_LiteralCompartment"; /** * @generated @@ -86,7 +86,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends Resizeable */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends Resizeable */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends Resizeable @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends Resizeable */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 90be50a13a8..6bbfee6f22c 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 @@ -41,7 +41,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends Resizeab /** * @generated */ - public static final String VISUAL_ID = "1062"; + public static final String VISUAL_ID = "Enumeration_LiteralCompartment_CN"; /** * @generated @@ -86,7 +86,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends Resizeab */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends Resizeab */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends Resizeab @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends Resizeab */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 6bd973082d1..7a6a8b94fb0 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 @@ -70,6 +70,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.EnumerationLiteralLabelEditPolicy; @@ -96,12 +97,13 @@ import org.eclipse.uml2.uml.UMLPackage; /** * @generated */ -public class EnumerationLiteralEditPart extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { +public class EnumerationLiteralEditPart extends CompartmentEditPart + implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1037"; + public static final String VISUAL_ID = "EnumerationLiteral_LiteralLabel"; /** * @generated @@ -149,7 +151,7 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I */ @Override public DragTracker getDragTracker(Request request) { - if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) { + if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; } return new DragEditPartsTrackerEx(this); @@ -165,20 +167,22 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeEnumerationLiteralDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new EnumerationLiteralLabelEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeEnumerationLiteralDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, + new EnumerationLiteralLabelEditPolicy()); } /** * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -186,12 +190,12 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -199,12 +203,12 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -212,12 +216,12 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -267,12 +271,12 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I */ protected Image getLabelIcon() { EObject parserElement = getParserElement(); - if(parserElement == null) { + if (parserElement == null) { return null; } List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer()); - for(View view : views) { - if(AppearanceHelper.showElementIcon(view)) { + for (View view : views) { + if (AppearanceHelper.showElementIcon(view)) { return UMLElementTypes.getImage(parserElement.eClass()); } } @@ -285,10 +289,11 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -300,12 +305,12 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -313,10 +318,11 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -334,22 +340,25 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), EnumerationLiteralEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -360,10 +369,10 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -377,8 +386,9 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.EnumerationLiteral_1037, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.EnumerationLiteral_LiteralLabel, getParserElement(), this, + VISUAL_ID); } return parser; } @@ -387,8 +397,10 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -417,8 +429,8 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -426,8 +438,8 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -438,46 +450,58 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -499,12 +523,13 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,12 +560,12 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -549,12 +574,12 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -562,15 +587,15 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -579,9 +604,9 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -590,9 +615,10 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -610,11 +636,11 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -626,8 +652,8 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -640,7 +666,7 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -666,13 +692,14 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -684,7 +711,7 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -706,12 +733,15 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -722,10 +752,13 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -744,12 +777,15 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -786,34 +822,38 @@ public class EnumerationLiteralEditPart extends CompartmentEditPart implements I @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON + .equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } - if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { + if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { refreshUnderline(); } super.handleNotificationEvent(event); 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 b8378505e68..3f033a1e33c 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 @@ -64,6 +64,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -85,12 +86,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class EnumerationNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5023"; + public static final String VISUAL_ID = "Enumeration_NameLabel"; /** * @generated @@ -148,12 +150,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -161,12 +163,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -174,12 +176,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -187,12 +189,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -242,12 +244,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen */ protected Image getLabelIcon() { EObject parserElement = getParserElement(); - if(parserElement == null) { + if (parserElement == null) { return null; } List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer()); - for(View view : views) { - if(AppearanceHelper.showElementIcon(view)) { + for (View view : views) { + if (AppearanceHelper.showElementIcon(view)) { return UMLElementTypes.getImage(parserElement.eClass()); } } @@ -260,10 +262,11 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -275,12 +278,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -288,10 +291,11 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -309,22 +313,25 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), EnumerationNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -335,10 +342,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -352,8 +359,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Enumeration_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -362,8 +369,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -392,8 +401,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -401,8 +410,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -413,46 +422,58 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -474,12 +495,13 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -510,12 +532,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -524,12 +546,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -537,15 +559,15 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -554,9 +576,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -565,9 +587,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -585,11 +608,11 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -601,8 +624,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -615,7 +638,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -641,13 +664,14 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -659,7 +683,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -681,12 +705,15 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -697,10 +724,13 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -719,12 +749,15 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -762,31 +795,35 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON + .equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -819,7 +856,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -829,6 +867,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -836,5 +875,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 dc289d89e95..63d64f4bbf0 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5055"; + public static final String VISUAL_ID = "Enumeration_NameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), EnumerationNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3025, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Enumeration_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 cbe334ded58..a7ba8de18e8 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 @@ -28,7 +28,7 @@ public class ExtensionEditPart extends UMLConnectionNodeEditPart implements ITre /** * @generated */ - public static final String VISUAL_ID = "1013"; + public static final String VISUAL_ID = "Extension_Edge"; /** * @generated @@ -44,7 +44,8 @@ public class ExtensionEditPart extends UMLConnectionNodeEditPart implements ITre protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(ExtensionCustomNameEditPolicy.SPECIFIC_EXTENSION_NAME_POLICY, new ExtensionCustomNameEditPolicy()); + installEditPolicy(ExtensionCustomNameEditPolicy.SPECIFIC_EXTENSION_NAME_POLICY, + new ExtensionCustomNameEditPolicy()); } /** @@ -65,6 +66,6 @@ public class ExtensionEditPart extends UMLConnectionNodeEditPart implements ITre */ @Override public ExtensionFigure getPrimaryShape() { - return (ExtensionFigure)getFigure(); + return (ExtensionFigure) getFigure(); } } 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 0c1772e1284..d504ad14ab3 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6007"; + public static final String VISUAL_ID = "Generalization_StereotypeLabel"; /** * @generated @@ -127,7 +129,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), + new Point(0, 60)); } /** @@ -160,12 +165,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -173,12 +178,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -186,12 +191,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -199,12 +204,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -262,10 +267,11 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -277,12 +283,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -290,10 +296,11 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -311,22 +318,28 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + GeneralizationAppliedStereotypeEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -337,10 +350,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -354,8 +367,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Generalization_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -364,8 +377,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -394,8 +409,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -403,8 +418,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -415,46 +430,58 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -476,12 +503,13 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -512,20 +540,20 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -533,15 +561,15 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -550,9 +578,9 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -561,9 +589,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,11 +610,11 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -597,8 +626,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -611,7 +640,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -648,7 +677,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -670,12 +699,15 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -686,10 +718,13 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -708,12 +743,15 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -732,30 +770,34 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 62735eafb15..1e3a97c43d4 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 @@ -31,7 +31,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ - public static final String VISUAL_ID = "4002"; + public static final String VISUAL_ID = "Generalization_Edge"; /** * @generated @@ -47,7 +47,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -55,8 +56,9 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof GeneralizationAppliedStereotypeEditPart) { - ((GeneralizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) { + ((GeneralizationAppliedStereotypeEditPart) childEditPart) + .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -66,7 +68,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -76,7 +78,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof GeneralizationAppliedStereotypeEditPart) { + if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) { return true; } return false; @@ -87,7 +89,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -111,6 +113,6 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements */ @Override public GeneralizationFigure getPrimaryShape() { - return (GeneralizationFigure)getFigure(); + return (GeneralizationFigure) getFigure(); } } 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 ca155a842a7..efa901af8aa 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 @@ -48,7 +48,7 @@ public class MetaclassEditPart extends ClassEditPart { /** * @generated */ - public static final String VISUAL_ID = "1031"; + public static final String VISUAL_ID = "Class_MetaclassShape"; /** * @generated @@ -74,9 +74,12 @@ public class MetaclassEditPart extends ClassEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -92,7 +95,7 @@ public class MetaclassEditPart extends ClassEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -120,12 +123,14 @@ public class MetaclassEditPart extends ClassEditPart { protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); //set the figure active when the feature of the of a class is true - if(resolveSemanticElement() != null) { - if(resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) && ((EAttribute)(event.getFeature())).getName().equals("isActive")) { - ((ClassFigure)getFigure()).setActive(event.getNewBooleanValue()); + if (resolveSemanticElement() != null) { + if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) + && ((EAttribute) (event.getFeature())).getName().equals("isActive")) { + ((ClassFigure) getFigure()).setActive(event.getNewBooleanValue()); refreshVisuals(); } } + } /** @@ -143,17 +148,18 @@ public class MetaclassEditPart extends ClassEditPart { */ @Override public ClassFigure getPrimaryShape() { - return (ClassFigure)primaryShape; + return (ClassFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof MetaclassNameEditPart) { - ((MetaclassNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof MetaclassNameEditPart) { + ((MetaclassNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } + return false; } @@ -161,7 +167,7 @@ public class MetaclassEditPart extends ClassEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof MetaclassNameEditPart) { + if (childEditPart instanceof MetaclassNameEditPart) { return true; } return false; @@ -172,7 +178,7 @@ public class MetaclassEditPart extends ClassEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -183,7 +189,7 @@ public class MetaclassEditPart extends ClassEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -217,6 +223,7 @@ public class MetaclassEditPart extends ClassEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -229,7 +236,7 @@ public class MetaclassEditPart extends ClassEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -242,7 +249,7 @@ public class MetaclassEditPart extends ClassEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -253,7 +260,7 @@ public class MetaclassEditPart extends ClassEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -271,8 +278,8 @@ public class MetaclassEditPart extends ClassEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 6d974712b78..ba66305ec7b 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 @@ -48,7 +48,7 @@ public class MetaclassEditPartCN extends ClassEditPart { /** * @generated */ - public static final String VISUAL_ID = "3028"; + public static final String VISUAL_ID = "Class_MetaclassShape_CN"; /** * @generated @@ -74,9 +74,12 @@ public class MetaclassEditPartCN extends ClassEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -92,7 +95,7 @@ public class MetaclassEditPartCN extends ClassEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -120,12 +123,14 @@ public class MetaclassEditPartCN extends ClassEditPart { protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); //set the figure active when the feature of the of a class is true - if(resolveSemanticElement() != null) { - if(resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) && ((EAttribute)(event.getFeature())).getName().equals("isActive")) { - ((ClassFigure)getFigure()).setActive(event.getNewBooleanValue()); + if (resolveSemanticElement() != null) { + if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) + && ((EAttribute) (event.getFeature())).getName().equals("isActive")) { + ((ClassFigure) getFigure()).setActive(event.getNewBooleanValue()); refreshVisuals(); } } + } /** @@ -143,17 +148,18 @@ public class MetaclassEditPartCN extends ClassEditPart { */ @Override public ClassFigure getPrimaryShape() { - return (ClassFigure)primaryShape; + return (ClassFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof MetaclassNameEditPartCN) { - ((MetaclassNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof MetaclassNameEditPartCN) { + ((MetaclassNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } + return false; } @@ -161,7 +167,7 @@ public class MetaclassEditPartCN extends ClassEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof MetaclassNameEditPartCN) { + if (childEditPart instanceof MetaclassNameEditPartCN) { return true; } return false; @@ -172,7 +178,7 @@ public class MetaclassEditPartCN extends ClassEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -183,7 +189,7 @@ public class MetaclassEditPartCN extends ClassEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -217,6 +223,7 @@ public class MetaclassEditPartCN extends ClassEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -229,7 +236,7 @@ public class MetaclassEditPartCN extends ClassEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -242,7 +249,7 @@ public class MetaclassEditPartCN extends ClassEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -253,7 +260,7 @@ public class MetaclassEditPartCN extends ClassEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -271,8 +278,8 @@ public class MetaclassEditPartCN extends ClassEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 a2b605d23bb..9c2755ab8e4 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class MetaclassNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1084"; + public static final String VISUAL_ID = "Class_MetaclassNameLabel"; /** * @generated @@ -144,12 +146,12 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), MetaclassNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Class_1031, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Class_MetaclassShape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class MetaclassNameEditPart extends PapyrusCompartmentEditPart implements */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 d89f51d6e3f..30d2b805268 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5062"; + public static final String VISUAL_ID = "Class_MetaclassNameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), MetaclassNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Class_3028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Class_MetaclassShape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class MetaclassNameEditPartCN extends PapyrusCompartmentEditPart implemen */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 3db955e4c3a..47fde6c6032 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 @@ -49,7 +49,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ - public static final String VISUAL_ID = "1027"; + public static final String VISUAL_ID = "Model_Shape_CN"; /** * @generated @@ -75,13 +75,17 @@ public class ModelEditPartCN extends PackageEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -95,7 +99,7 @@ public class ModelEditPartCN extends PackageEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -122,6 +126,7 @@ public class ModelEditPartCN extends PackageEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -139,23 +144,25 @@ public class ModelEditPartCN extends PackageEditPart { */ @Override public PackageFigure getPrimaryShape() { - return (PackageFigure)primaryShape; + return (PackageFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ModelNameEditPartCN) { - ((ModelNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ModelNameEditPartCN) { + ((ModelNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) { + + if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((ModelPackageableElementCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure()); return true; } + return false; } @@ -163,12 +170,12 @@ public class ModelEditPartCN extends PackageEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ModelNameEditPartCN) { + if (childEditPart instanceof ModelNameEditPartCN) { return true; } - if(childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) { + if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - pane.remove(((ModelPackageableElementCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure()); return true; } return false; @@ -179,7 +186,7 @@ public class ModelEditPartCN extends PackageEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -190,7 +197,7 @@ public class ModelEditPartCN extends PackageEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -201,7 +208,7 @@ public class ModelEditPartCN extends PackageEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof ModelPackageableElementCompartmentEditPartCN) { + if (editPart instanceof ModelPackageableElementCompartmentEditPartCN) { return getPrimaryShape().getPackageableElementFigure(); } return getContentPane(); @@ -227,6 +234,7 @@ public class ModelEditPartCN extends PackageEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -239,7 +247,7 @@ public class ModelEditPartCN extends PackageEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -252,7 +260,7 @@ public class ModelEditPartCN extends PackageEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -263,7 +271,7 @@ public class ModelEditPartCN extends PackageEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -281,8 +289,8 @@ public class ModelEditPartCN extends PackageEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 184b5d9d930..ca469fabc64 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 @@ -49,7 +49,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ - public static final String VISUAL_ID = "2005"; + public static final String VISUAL_ID = "Model_Shape"; /** * @generated @@ -75,13 +75,17 @@ public class ModelEditPartTN extends PackageEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -95,7 +99,7 @@ public class ModelEditPartTN extends PackageEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -122,6 +126,7 @@ public class ModelEditPartTN extends PackageEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -139,23 +144,25 @@ public class ModelEditPartTN extends PackageEditPart { */ @Override public PackageFigure getPrimaryShape() { - return (PackageFigure)primaryShape; + return (PackageFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ModelNameEditPart) { - ((ModelNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ModelNameEditPart) { + ((ModelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof ModelPackageableElementCompartmentEditPartTN) { + + if (childEditPart instanceof ModelPackageableElementCompartmentEditPartTN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((ModelPackageableElementCompartmentEditPartTN)childEditPart).getFigure()); + pane.add(((ModelPackageableElementCompartmentEditPartTN) childEditPart).getFigure()); return true; } + return false; } @@ -163,12 +170,12 @@ public class ModelEditPartTN extends PackageEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ModelNameEditPart) { + if (childEditPart instanceof ModelNameEditPart) { return true; } - if(childEditPart instanceof ModelPackageableElementCompartmentEditPartTN) { + if (childEditPart instanceof ModelPackageableElementCompartmentEditPartTN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - pane.remove(((ModelPackageableElementCompartmentEditPartTN)childEditPart).getFigure()); + pane.remove(((ModelPackageableElementCompartmentEditPartTN) childEditPart).getFigure()); return true; } return false; @@ -179,7 +186,7 @@ public class ModelEditPartTN extends PackageEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -190,7 +197,7 @@ public class ModelEditPartTN extends PackageEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -201,7 +208,7 @@ public class ModelEditPartTN extends PackageEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof ModelPackageableElementCompartmentEditPartTN) { + if (editPart instanceof ModelPackageableElementCompartmentEditPartTN) { return getPrimaryShape().getPackageableElementFigure(); } return getContentPane(); @@ -227,6 +234,7 @@ public class ModelEditPartTN extends PackageEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -239,7 +247,7 @@ public class ModelEditPartTN extends PackageEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -252,7 +260,7 @@ public class ModelEditPartTN extends PackageEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -263,7 +271,7 @@ public class ModelEditPartTN extends PackageEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -281,8 +289,8 @@ public class ModelEditPartTN extends PackageEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 361a4b115cd..14197b4c763 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ModelNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5020"; + public static final String VISUAL_ID = "Model_NameLabel"; /** * @generated @@ -144,12 +146,12 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,26 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), ModelNameEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +329,10 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +346,8 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Model_2005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Model_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +356,10 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +388,8 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +397,8 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +409,58 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +482,13 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +519,12 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +533,12 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +546,15 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +563,9 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +574,10 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +595,11 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +611,8 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +625,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +651,14 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +670,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +692,15 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +711,13 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +736,15 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +782,27 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +839,8 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +850,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +858,6 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 eb03f93ac5e..c2952ea162c 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ModelNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1056"; + public static final String VISUAL_ID = "Model_NameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ModelNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Model_1027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Model_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 fea0012df5b..65ecadb8fbe 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 @@ -42,7 +42,7 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom /** * @generated */ - public static final String VISUAL_ID = "1058"; + public static final String VISUAL_ID = "Model_PackagedElementCompartment_CN"; /** * @generated @@ -80,7 +80,7 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -90,6 +90,7 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -99,7 +100,10 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -109,13 +113,13 @@ public class ModelPackageableElementCompartmentEditPartCN extends LinkLFShapeCom * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 9d4b89a98d6..04b523a47bd 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 @@ -42,7 +42,7 @@ public class ModelPackageableElementCompartmentEditPartTN extends LinkLFShapeCom /** * @generated */ - public static final String VISUAL_ID = "1057"; + public static final String VISUAL_ID = "Model_PackagedElementCompartment"; /** * @generated @@ -80,7 +80,7 @@ public class ModelPackageableElementCompartmentEditPartTN extends LinkLFShapeCom */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -90,6 +90,7 @@ public class ModelPackageableElementCompartmentEditPartTN extends LinkLFShapeCom */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -99,7 +100,10 @@ public class ModelPackageableElementCompartmentEditPartTN extends LinkLFShapeCom @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -109,13 +113,13 @@ public class ModelPackageableElementCompartmentEditPartTN extends LinkLFShapeCom * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 cecc121bd3e..8609befba57 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 @@ -63,6 +63,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart { +public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IBorderItemEditPart { /** * @generated */ - public static final String VISUAL_ID = "1"; + public static final String VISUAL_ID = "Dependency_MultiNameLabel"; /** * @generated @@ -127,7 +129,10 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), new Point(0, 0)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), + new Point(0, 0)); } /** @@ -154,9 +159,9 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); - if(parentFigure != null && parentFigure.getLayoutManager() != null) { + if (parentFigure != null && parentFigure.getLayoutManager() != null) { Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure()); - return (IBorderItemLocator)constraint; + return (IBorderItemLocator) constraint; } return null; } @@ -166,10 +171,10 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement */ @Override public void refreshBounds() { - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height)); } @@ -177,12 +182,12 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -190,12 +195,12 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -203,12 +208,12 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -216,12 +221,12 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -279,10 +284,11 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -294,12 +300,12 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -307,10 +313,11 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -328,22 +335,26 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), + MultiDependencyLabelEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -354,10 +365,10 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -371,8 +382,8 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_2014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Dependency_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -381,8 +392,10 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -411,8 +424,8 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -420,8 +433,8 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -432,46 +445,58 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -493,12 +518,13 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -529,20 +555,20 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -550,15 +576,15 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -567,9 +593,9 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -578,9 +604,10 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,11 +625,11 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -614,8 +641,8 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -628,7 +655,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -654,13 +681,14 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -672,7 +700,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -694,12 +722,15 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -710,10 +741,13 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -732,12 +766,15 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -756,24 +793,27 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); 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 c54573fc62e..1f34e4adf1e 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 @@ -48,7 +48,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ - public static final String VISUAL_ID = "2007"; + public static final String VISUAL_ID = "Package_Shape"; /** * @generated @@ -74,13 +74,17 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -94,7 +98,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -121,6 +125,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -138,23 +143,25 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit */ @Override public PackageFigure getPrimaryShape() { - return (PackageFigure)primaryShape; + return (PackageFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PackageNameEditPart) { - ((PackageNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof PackageNameEditPart) { + ((PackageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof PackagePackageableElementCompartmentEditPart) { + + if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((PackagePackageableElementCompartmentEditPart)childEditPart).getFigure()); + pane.add(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure()); return true; } + return false; } @@ -162,12 +169,12 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PackageNameEditPart) { + if (childEditPart instanceof PackageNameEditPart) { return true; } - if(childEditPart instanceof PackagePackageableElementCompartmentEditPart) { + if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - pane.remove(((PackagePackageableElementCompartmentEditPart)childEditPart).getFigure()); + pane.remove(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure()); return true; } return false; @@ -178,7 +185,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -189,7 +196,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -200,7 +207,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof PackagePackageableElementCompartmentEditPart) { + if (editPart instanceof PackagePackageableElementCompartmentEditPart) { return getPrimaryShape().getPackageableElementFigure(); } return getContentPane(); @@ -226,6 +233,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -238,7 +246,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -251,7 +259,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -262,7 +270,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -280,8 +288,8 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 6b8624941ee..f85fb5a8fd9 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 @@ -51,7 +51,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ - public static final String VISUAL_ID = "1012"; + public static final String VISUAL_ID = "Package_Shape_CN"; /** * @generated @@ -78,14 +78,18 @@ public class PackageEditPartCN extends PackageEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -99,7 +103,7 @@ public class PackageEditPartCN extends PackageEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -126,6 +130,7 @@ public class PackageEditPartCN extends PackageEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -143,23 +148,25 @@ public class PackageEditPartCN extends PackageEditPart { */ @Override public PackageFigure getPrimaryShape() { - return (PackageFigure)primaryShape; + return (PackageFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PackageNameEditPartCN) { - ((PackageNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof PackageNameEditPartCN) { + ((PackageNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) { + + if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((PackagePackageableElementCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure()); return true; } + return false; } @@ -167,12 +174,12 @@ public class PackageEditPartCN extends PackageEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PackageNameEditPartCN) { + if (childEditPart instanceof PackageNameEditPartCN) { return true; } - if(childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) { + if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - pane.remove(((PackagePackageableElementCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure()); return true; } return false; @@ -183,7 +190,7 @@ public class PackageEditPartCN extends PackageEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -194,7 +201,7 @@ public class PackageEditPartCN extends PackageEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -205,7 +212,7 @@ public class PackageEditPartCN extends PackageEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof PackagePackageableElementCompartmentEditPartCN) { + if (editPart instanceof PackagePackageableElementCompartmentEditPartCN) { return getPrimaryShape().getPackageableElementFigure(); } return getContentPane(); @@ -231,6 +238,7 @@ public class PackageEditPartCN extends PackageEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -243,7 +251,7 @@ public class PackageEditPartCN extends PackageEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -256,7 +264,7 @@ public class PackageEditPartCN extends PackageEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -267,7 +275,7 @@ public class PackageEditPartCN extends PackageEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -285,8 +293,8 @@ public class PackageEditPartCN extends PackageEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 5d86b7e23fc..e98369ed80e 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 @@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -83,12 +84,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { +public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit, ILabelRoleProvider { /** * @generated */ - public static final String VISUAL_ID = "6022"; + public static final String VISUAL_ID = "PackageImport_StereotypeLabel"; /** * @generated @@ -127,7 +129,10 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60)); + registerSnapBackPosition( + UMLVisualIDRegistry.getType( + org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID), + new Point(0, 60)); } /** @@ -160,12 +165,12 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -173,12 +178,12 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -186,12 +191,12 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -199,12 +204,12 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -262,10 +267,11 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -277,12 +283,12 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -290,10 +296,11 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -311,22 +318,28 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult( + parser.isValidEditString( + ParserUtil.getParserAdapter(getParserElement(), + PackageImportAppliedStereotypeEditPart.this), + (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -337,10 +350,10 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -354,8 +367,8 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_1065, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.PackageImport_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -364,8 +377,10 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -394,8 +409,8 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -403,8 +418,8 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -415,46 +430,58 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -476,12 +503,13 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -512,20 +540,20 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -533,15 +561,15 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -550,9 +578,9 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -561,9 +589,10 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,11 +610,11 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -597,8 +626,8 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -611,7 +640,7 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -648,7 +677,7 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -670,12 +699,15 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -686,10 +718,13 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -708,12 +743,15 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -732,30 +770,34 @@ public class PackageImportAppliedStereotypeEditPart extends PapyrusLabelEditPart @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } + super.handleNotificationEvent(event); } 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 de8d8c84428..87699bf3d4e 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 @@ -32,7 +32,7 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ - public static final String VISUAL_ID = "1065"; + public static final String VISUAL_ID = "PackageImport_Edge"; /** * @generated @@ -49,15 +49,17 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeLinkLabelDisplayEditPolicy()); } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PackageImportAppliedStereotypeEditPart) { - ((PackageImportAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + if (childEditPart instanceof PackageImportAppliedStereotypeEditPart) { + ((PackageImportAppliedStereotypeEditPart) childEditPart) + .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -67,7 +69,7 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -77,7 +79,7 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PackageImportAppliedStereotypeEditPart) { + if (childEditPart instanceof PackageImportAppliedStereotypeEditPart) { return true; } return false; @@ -88,7 +90,7 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -112,6 +114,6 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements */ @Override public DashedEdgeFigure getPrimaryShape() { - return (DashedEdgeFigure)getFigure(); + return (DashedEdgeFigure) getFigure(); } } 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 8aa0d767fe2..c71aa0a7a35 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class PackageNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class PackageNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5026"; + public static final String VISUAL_ID = "Package_NameLabel"; /** * @generated @@ -144,12 +146,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), PackageNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Package_2007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Package_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 1219df21812..34ed8f998c4 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class PackageNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1010"; + public static final String VISUAL_ID = "Package_NameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), PackageNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Package_1012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Package_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 3e839e48960..879a6918d8d 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 @@ -42,7 +42,7 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom /** * @generated */ - public static final String VISUAL_ID = "1005"; + public static final String VISUAL_ID = "Package_PackagedElementCompartment"; /** * @generated @@ -80,7 +80,7 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -90,6 +90,7 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -99,7 +100,10 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -109,13 +113,13 @@ public class PackagePackageableElementCompartmentEditPart extends LinkLFShapeCom * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 232084a4045..1fdc1e1c9de 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 @@ -42,7 +42,7 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC /** * @generated */ - public static final String VISUAL_ID = "11"; + public static final String VISUAL_ID = "Package_PackagedElementCompartment_CN"; /** * @generated @@ -80,7 +80,7 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -90,6 +90,7 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -99,7 +100,10 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -109,13 +113,13 @@ public class PackagePackageableElementCompartmentEditPartCN extends LinkLFShapeC * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 ae0392a413a..f485ab2dd8f 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 @@ -47,7 +47,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ - public static final String VISUAL_ID = "2009"; + public static final String VISUAL_ID = "PrimitiveType_Shape"; /** * @generated @@ -73,11 +73,14 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -91,7 +94,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -118,6 +121,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -135,17 +139,18 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { */ @Override public PrimitiveTypeFigure getPrimaryShape() { - return (PrimitiveTypeFigure)primaryShape; + return (PrimitiveTypeFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PrimitiveTypeNameEditPart) { - ((PrimitiveTypeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof PrimitiveTypeNameEditPart) { + ((PrimitiveTypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } + return false; } @@ -153,7 +158,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PrimitiveTypeNameEditPart) { + if (childEditPart instanceof PrimitiveTypeNameEditPart) { return true; } return false; @@ -164,7 +169,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -175,7 +180,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -209,6 +214,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -221,7 +227,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -234,7 +240,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -245,7 +251,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -263,8 +269,8 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 442aca62df0..65d8c206c5a 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 @@ -47,7 +47,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ - public static final String VISUAL_ID = "3026"; + public static final String VISUAL_ID = "PrimitiveType_Shape_CN"; /** * @generated @@ -73,11 +73,14 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -91,7 +94,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -118,6 +121,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -135,17 +139,18 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { */ @Override public PrimitiveTypeFigure getPrimaryShape() { - return (PrimitiveTypeFigure)primaryShape; + return (PrimitiveTypeFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PrimitiveTypeNameEditPartCN) { - ((PrimitiveTypeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof PrimitiveTypeNameEditPartCN) { + ((PrimitiveTypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } + return false; } @@ -153,7 +158,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof PrimitiveTypeNameEditPartCN) { + if (childEditPart instanceof PrimitiveTypeNameEditPartCN) { return true; } return false; @@ -164,7 +169,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -175,7 +180,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -209,6 +214,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -221,7 +227,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -234,7 +240,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -245,7 +251,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -263,8 +269,8 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 a36fbdc9aae..226adc942aa 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 @@ -64,6 +64,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -85,12 +86,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5032"; + public static final String VISUAL_ID = "PrimitiveType_NameLabel"; /** * @generated @@ -148,12 +150,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -161,12 +163,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -174,12 +176,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -187,12 +189,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -242,12 +244,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem */ protected Image getLabelIcon() { EObject parserElement = getParserElement(); - if(parserElement == null) { + if (parserElement == null) { return null; } List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer()); - for(View view : views) { - if(AppearanceHelper.showElementIcon(view)) { + for (View view : views) { + if (AppearanceHelper.showElementIcon(view)) { return UMLElementTypes.getImage(parserElement.eClass()); } } @@ -260,10 +262,11 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -275,12 +278,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -288,10 +291,11 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -309,22 +313,25 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), PrimitiveTypeNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -335,10 +342,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -352,8 +359,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -362,8 +369,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -392,8 +401,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -401,8 +410,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -413,46 +422,58 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -474,12 +495,13 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -510,12 +532,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -524,12 +546,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -537,15 +559,15 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -554,9 +576,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -565,9 +587,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -585,11 +608,11 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -601,8 +624,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -615,7 +638,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -641,13 +664,14 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -659,7 +683,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -681,12 +705,15 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -697,10 +724,13 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -719,12 +749,15 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -762,31 +795,35 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON + .equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -819,7 +856,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -829,6 +867,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -836,5 +875,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 b0965697afc..b1df1225265 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 @@ -64,6 +64,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -85,12 +86,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "5058"; + public static final String VISUAL_ID = "PrimitiveType_NameLabel_CN"; /** * @generated @@ -148,12 +150,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -161,12 +163,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -174,12 +176,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -187,12 +189,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -242,12 +244,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl */ protected Image getLabelIcon() { EObject parserElement = getParserElement(); - if(parserElement == null) { + if (parserElement == null) { return null; } List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer()); - for(View view : views) { - if(AppearanceHelper.showElementIcon(view)) { + for (View view : views) { + if (AppearanceHelper.showElementIcon(view)) { return UMLElementTypes.getImage(parserElement.eClass()); } } @@ -260,10 +262,11 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -275,12 +278,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -288,10 +291,11 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -309,22 +313,25 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), PrimitiveTypeNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -335,10 +342,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -352,8 +359,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -362,8 +369,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -392,8 +401,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -401,8 +410,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -413,46 +422,58 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -474,12 +495,13 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -510,12 +532,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -524,12 +546,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -537,15 +559,15 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -554,9 +576,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -565,9 +587,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -585,11 +608,11 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -601,8 +624,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -615,7 +638,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -641,13 +664,14 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -659,7 +683,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -681,12 +705,15 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -697,10 +724,13 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -719,12 +749,15 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -762,31 +795,35 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); } } } - if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON + .equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -819,7 +856,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -829,6 +867,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -836,5 +875,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 12b88aacc4d..c64d8ec836b 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 @@ -27,7 +27,7 @@ public class ProfileApplicationEditPart extends UMLConnectionNodeEditPart implem /** * @generated */ - public static final String VISUAL_ID = "1045"; + public static final String VISUAL_ID = "ProfileApplication_Edge"; /** * @generated @@ -63,6 +63,6 @@ public class ProfileApplicationEditPart extends UMLConnectionNodeEditPart implem */ @Override public DashedEdgeFigure getPrimaryShape() { - return (DashedEdgeFigure)getFigure(); + return (DashedEdgeFigure) getFigure(); } } 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 d4845e3f17e..3c2b787d605 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 @@ -36,7 +36,7 @@ public class ProfileDiagramEditPart extends PapyrusDiagramEditPart { /** * @generated */ - public static final String VISUAL_ID = "1000"; + public static final String VISUAL_ID = "Profile_ProfileDiagram"; /** * @generated @@ -51,13 +51,16 @@ public class ProfileDiagramEditPart extends PapyrusDiagramEditPart { @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); + installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); + installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy()); installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ProfileDiagramDragDropEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomCreationRoleEditPolicy()); - installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE, new ShowHideRelatedLinkEditPolicy()); + installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE, + new ShowHideRelatedLinkEditPolicy()); // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE); } } 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 a327e8ef4df..ca7659f0f50 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 @@ -49,7 +49,7 @@ public class ProfileEditPartCN extends PackageEditPart { /** * @generated */ - public static final String VISUAL_ID = "1024"; + public static final String VISUAL_ID = "Profile_Shape_CN"; /** * @generated @@ -75,13 +75,17 @@ public class ProfileEditPartCN extends PackageEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -95,7 +99,7 @@ public class ProfileEditPartCN extends PackageEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -122,6 +126,7 @@ public class ProfileEditPartCN extends PackageEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -139,23 +144,25 @@ public class ProfileEditPartCN extends PackageEditPart { */ @Override public ProfileFigure getPrimaryShape() { - return (ProfileFigure)primaryShape; + return (ProfileFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ProfileNameEditPartCN) { - ((ProfileNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ProfileNameEditPartCN) { + ((ProfileNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof ProfilePackageableElementCompartmentEditPartCN) { + + if (childEditPart instanceof ProfilePackageableElementCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((ProfilePackageableElementCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((ProfilePackageableElementCompartmentEditPartCN) childEditPart).getFigure()); return true; } + return false; } @@ -163,12 +170,12 @@ public class ProfileEditPartCN extends PackageEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ProfileNameEditPartCN) { + if (childEditPart instanceof ProfileNameEditPartCN) { return true; } - if(childEditPart instanceof ProfilePackageableElementCompartmentEditPartCN) { + if (childEditPart instanceof ProfilePackageableElementCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - pane.remove(((ProfilePackageableElementCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((ProfilePackageableElementCompartmentEditPartCN) childEditPart).getFigure()); return true; } return false; @@ -179,7 +186,7 @@ public class ProfileEditPartCN extends PackageEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -190,7 +197,7 @@ public class ProfileEditPartCN extends PackageEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -201,7 +208,7 @@ public class ProfileEditPartCN extends PackageEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof ProfilePackageableElementCompartmentEditPartCN) { + if (editPart instanceof ProfilePackageableElementCompartmentEditPartCN) { return getPrimaryShape().getPackageableElementFigure(); } return getContentPane(); @@ -227,6 +234,7 @@ public class ProfileEditPartCN extends PackageEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -239,7 +247,7 @@ public class ProfileEditPartCN extends PackageEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -252,7 +260,7 @@ public class ProfileEditPartCN extends PackageEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -263,7 +271,7 @@ public class ProfileEditPartCN extends PackageEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -281,8 +289,8 @@ public class ProfileEditPartCN extends PackageEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 de7fcb7fa66..51d7fa7a6ad 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 @@ -49,7 +49,7 @@ public class ProfileEditPartTN extends PackageEditPart { /** * @generated */ - public static final String VISUAL_ID = "1030"; + public static final String VISUAL_ID = "Profile_Shape"; /** * @generated @@ -75,13 +75,17 @@ public class ProfileEditPartTN extends PackageEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, + new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -95,7 +99,7 @@ public class ProfileEditPartTN extends PackageEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -122,6 +126,7 @@ public class ProfileEditPartTN extends PackageEditPart { @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); + } /** @@ -139,23 +144,25 @@ public class ProfileEditPartTN extends PackageEditPart { */ @Override public ProfileFigure getPrimaryShape() { - return (ProfileFigure)primaryShape; + return (ProfileFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ProfileNameEditPartTN) { - ((ProfileNameEditPartTN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof ProfileNameEditPartTN) { + ((ProfileNameEditPartTN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof ProfilePackageableElementCompartmentEditPartTN) { + + if (childEditPart instanceof ProfilePackageableElementCompartmentEditPartTN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((ProfilePackageableElementCompartmentEditPartTN)childEditPart).getFigure()); + pane.add(((ProfilePackageableElementCompartmentEditPartTN) childEditPart).getFigure()); return true; } + return false; } @@ -163,12 +170,12 @@ public class ProfileEditPartTN extends PackageEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof ProfileNameEditPartTN) { + if (childEditPart instanceof ProfileNameEditPartTN) { return true; } - if(childEditPart instanceof ProfilePackageableElementCompartmentEditPartTN) { + if (childEditPart instanceof ProfilePackageableElementCompartmentEditPartTN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - pane.remove(((ProfilePackageableElementCompartmentEditPartTN)childEditPart).getFigure()); + pane.remove(((ProfilePackageableElementCompartmentEditPartTN) childEditPart).getFigure()); return true; } return false; @@ -179,7 +186,7 @@ public class ProfileEditPartTN extends PackageEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -190,7 +197,7 @@ public class ProfileEditPartTN extends PackageEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -201,7 +208,7 @@ public class ProfileEditPartTN extends PackageEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof ProfilePackageableElementCompartmentEditPartTN) { + if (editPart instanceof ProfilePackageableElementCompartmentEditPartTN) { return getPrimaryShape().getPackageableElementFigure(); } return getContentPane(); @@ -227,6 +234,7 @@ public class ProfileEditPartTN extends PackageEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -239,7 +247,7 @@ public class ProfileEditPartTN extends PackageEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -252,7 +260,7 @@ public class ProfileEditPartTN extends PackageEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -263,7 +271,7 @@ public class ProfileEditPartTN extends PackageEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -281,8 +289,8 @@ public class ProfileEditPartTN extends PackageEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 73f3e527bfc..0f3ea07acdb 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1050"; + public static final String VISUAL_ID = "Profile_NameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ProfileNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Profile_1024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Profile_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 eac1f70abb7..eb5f4e60f95 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1047"; + public static final String VISUAL_ID = "Profile_NameLabel"; /** * @generated @@ -144,12 +146,12 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), ProfileNameEditPartTN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Profile_1030, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartTN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Profile_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 842e8497d1a..969dab2268e 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 @@ -42,7 +42,7 @@ public class ProfilePackageableElementCompartmentEditPartCN extends LinkLFShapeC /** * @generated */ - public static final String VISUAL_ID = "1051"; + public static final String VISUAL_ID = "Profile_PackagedElementCompartment_CN"; /** * @generated @@ -80,7 +80,7 @@ public class ProfilePackageableElementCompartmentEditPartCN extends LinkLFShapeC */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -90,6 +90,7 @@ public class ProfilePackageableElementCompartmentEditPartCN extends LinkLFShapeC */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -99,7 +100,10 @@ public class ProfilePackageableElementCompartmentEditPartCN extends LinkLFShapeC @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -109,13 +113,13 @@ public class ProfilePackageableElementCompartmentEditPartCN extends LinkLFShapeC * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 6db34da12d0..4ceb70a41d3 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 @@ -42,7 +42,7 @@ public class ProfilePackageableElementCompartmentEditPartTN extends LinkLFShapeC /** * @generated */ - public static final String VISUAL_ID = "1042"; + public static final String VISUAL_ID = "Profile_PackagedElementCompartment"; /** * @generated @@ -80,7 +80,7 @@ public class ProfilePackageableElementCompartmentEditPartTN extends LinkLFShapeC */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -90,6 +90,7 @@ public class ProfilePackageableElementCompartmentEditPartTN extends LinkLFShapeC */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -99,7 +100,10 @@ public class ProfilePackageableElementCompartmentEditPartTN extends LinkLFShapeC @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -109,13 +113,13 @@ public class ProfilePackageableElementCompartmentEditPartTN extends LinkLFShapeC * @generated */ protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 149655da623..2c7bc4e3576 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 @@ -57,7 +57,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ - public static final String VISUAL_ID = "2016"; + public static final String VISUAL_ID = "Diagram_ShortcutShape"; /** * @generated @@ -83,7 +83,9 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicyRoles.OPEN_ROLE, new ShortCutDiagramEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); @@ -100,16 +102,16 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { - View childView = (View)child.getModel(); + View childView = (View) child.getModel(); String vid = UMLVisualIDRegistry.getVisualID(childView); - if(vid != null) { - switch(vid) { + if (vid != null) { + switch (vid) { case DiagramNameEditPart.VISUAL_ID: return new BorderItemSelectionEditPolicy() { @Override protected List<?> createSelectionHandles() { - MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost()); + MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost()); mh.setBorder(null); return Collections.singletonList(mh); } @@ -117,7 +119,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { } } EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -147,16 +149,17 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)! */ - if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { + if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); - List<?> modelChildren = ((View)getModel()).getChildren(); - if(false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { - if(modelChildren.contains(event.getNotifier())) { + List<?> modelChildren = ((View) getModel()).getChildren(); + if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (modelChildren.contains(event.getNotifier())) { return; } } } super.handleNotificationEvent(event); + } /** @@ -174,7 +177,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { */ @Override public DiagramNodeFigure getPrimaryShape() { - return (DiagramNodeFigure)primaryShape; + return (DiagramNodeFigure) primaryShape; } /** @@ -182,7 +185,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { */ @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { - if(borderItemEditPart instanceof DiagramNameEditPart) { + if (borderItemEditPart instanceof DiagramNameEditPart) { BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH); locator.setBorderItemOffset(new Dimension(-20, -20)); borderItemContainer.add(borderItemEditPart.getFigure(), locator); @@ -211,6 +214,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -231,7 +235,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -242,7 +246,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -260,8 +264,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)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 826a5311581..40bd07151b8 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 @@ -41,7 +41,7 @@ public class StereotypeAttributeCompartmentEditPart extends ResizeableListCompar /** * @generated */ - public static final String VISUAL_ID = "1071"; + public static final String VISUAL_ID = "Stereotype_AttributeCompartment"; /** * @generated @@ -86,7 +86,7 @@ public class StereotypeAttributeCompartmentEditPart extends ResizeableListCompar */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class StereotypeAttributeCompartmentEditPart extends ResizeableListCompar */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class StereotypeAttributeCompartmentEditPart extends ResizeableListCompar @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class StereotypeAttributeCompartmentEditPart extends ResizeableListCompar */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 7f4dbf13273..8a9811d0a5d 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 @@ -41,7 +41,7 @@ public class StereotypeAttributeCompartmentEditPartCN extends ResizeableListComp /** * @generated */ - public static final String VISUAL_ID = "1052"; + public static final String VISUAL_ID = "Stereotype_AttributeCompartment_CN"; /** * @generated @@ -86,7 +86,7 @@ public class StereotypeAttributeCompartmentEditPartCN extends ResizeableListComp */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class StereotypeAttributeCompartmentEditPartCN extends ResizeableListComp */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class StereotypeAttributeCompartmentEditPartCN extends ResizeableListComp @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class StereotypeAttributeCompartmentEditPartCN extends ResizeableListComp */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 215df116c90..afff4436aba 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 @@ -55,7 +55,7 @@ public class StereotypeEditPart extends ClassEditPart { /** * @generated */ - public static final String VISUAL_ID = "1026"; + public static final String VISUAL_ID = "Stereotype_Shape"; /** * @generated @@ -82,13 +82,17 @@ public class StereotypeEditPart extends ClassEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, + new ShowHideClassifierContentsEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -102,7 +106,7 @@ public class StereotypeEditPart extends ClassEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -130,12 +134,14 @@ public class StereotypeEditPart extends ClassEditPart { protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); //set the figure active when the feature of the of a class is true - if(resolveSemanticElement() != null) { - if(resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) && ((EAttribute)(event.getFeature())).getName().equals("isActive")) { - ((ClassFigure)getFigure()).setActive(event.getNewBooleanValue()); + if (resolveSemanticElement() != null) { + if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) + && ((EAttribute) (event.getFeature())).getName().equals("isActive")) { + ((ClassFigure) getFigure()).setActive(event.getNewBooleanValue()); refreshVisuals(); } } + } /** @@ -153,29 +159,32 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override public StereotypeFigure getPrimaryShape() { - return (StereotypeFigure)primaryShape; + return (StereotypeFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof StereotypeNameEditPart) { - ((StereotypeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof StereotypeNameEditPart) { + ((StereotypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof StereotypeAttributeCompartmentEditPart) { + + if (childEditPart instanceof StereotypeAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((StereotypeAttributeCompartmentEditPart)childEditPart).getFigure()); + pane.add(((StereotypeAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } - if(childEditPart instanceof StereotypeOperationCompartmentEditPart) { + + if (childEditPart instanceof StereotypeOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((StereotypeOperationCompartmentEditPart)childEditPart).getFigure()); + pane.add(((StereotypeOperationCompartmentEditPart) childEditPart).getFigure()); return true; } + return false; } @@ -183,17 +192,17 @@ public class StereotypeEditPart extends ClassEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof StereotypeNameEditPart) { + if (childEditPart instanceof StereotypeNameEditPart) { return true; } - if(childEditPart instanceof StereotypeAttributeCompartmentEditPart) { + if (childEditPart instanceof StereotypeAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - pane.remove(((StereotypeAttributeCompartmentEditPart)childEditPart).getFigure()); + pane.remove(((StereotypeAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } - if(childEditPart instanceof StereotypeOperationCompartmentEditPart) { + if (childEditPart instanceof StereotypeOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - pane.remove(((StereotypeOperationCompartmentEditPart)childEditPart).getFigure()); + pane.remove(((StereotypeOperationCompartmentEditPart) childEditPart).getFigure()); return true; } return false; @@ -204,7 +213,7 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -215,7 +224,7 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -226,10 +235,10 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof StereotypeAttributeCompartmentEditPart) { + if (editPart instanceof StereotypeAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); } - if(editPart instanceof StereotypeOperationCompartmentEditPart) { + if (editPart instanceof StereotypeOperationCompartmentEditPart) { return getPrimaryShape().getOperationCompartmentFigure(); } return getContentPane(); @@ -255,6 +264,7 @@ public class StereotypeEditPart extends ClassEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -267,7 +277,7 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -280,7 +290,7 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -291,7 +301,7 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -309,8 +319,8 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); + if (primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); } } @@ -327,14 +337,17 @@ public class StereotypeEditPart extends ClassEditPart { */ @Override public EditPart getTargetEditPart(Request request) { - if(request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); - IElementType type = (IElementType)adapter.getAdapter(IElementType.class); - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Property_3002)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeAttributeCompartmentEditPart.VISUAL_ID)); + if (request instanceof CreateViewAndElementRequest) { + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() + .getCreateElementRequestAdapter(); + IElementType type = (IElementType) adapter.getAdapter(IElementType.class); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ClassAttributeLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(StereotypeAttributeCompartmentEditPart.VISUAL_ID)); } - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_3020)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeOperationCompartmentEditPart.VISUAL_ID)); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_ClassOperationLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(StereotypeOperationCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); 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 477cf93f5df..3bf0fbd7b71 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 @@ -55,7 +55,7 @@ public class StereotypeEditPartCN extends ClassEditPart { /** * @generated */ - public static final String VISUAL_ID = "1023"; + public static final String VISUAL_ID = "Stereotype_Shape_CN"; /** * @generated @@ -82,13 +82,17 @@ public class StereotypeEditPartCN extends ClassEditPart { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); + installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, + new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, + new ShowHideClassifierContentsEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -102,7 +106,7 @@ public class StereotypeEditPartCN extends ClassEditPart { @Override protected EditPolicy createChildEditPolicy(EditPart child) { EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(result == null) { + if (result == null) { result = new NonResizableEditPolicy(); } return result; @@ -130,12 +134,14 @@ public class StereotypeEditPartCN extends ClassEditPart { protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); //set the figure active when the feature of the of a class is true - if(resolveSemanticElement() != null) { - if(resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) && ((EAttribute)(event.getFeature())).getName().equals("isActive")) { - ((ClassFigure)getFigure()).setActive(event.getNewBooleanValue()); + if (resolveSemanticElement() != null) { + if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) + && ((EAttribute) (event.getFeature())).getName().equals("isActive")) { + ((ClassFigure) getFigure()).setActive(event.getNewBooleanValue()); refreshVisuals(); } } + } /** @@ -153,29 +159,32 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override public StereotypeFigure getPrimaryShape() { - return (StereotypeFigure)primaryShape; + return (StereotypeFigure) primaryShape; } /** * @generated */ protected boolean addFixedChild(EditPart childEditPart) { - if(childEditPart instanceof StereotypeNameEditPartCN) { - ((StereotypeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel()); + if (childEditPart instanceof StereotypeNameEditPartCN) { + ((StereotypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel()); return true; } - if(childEditPart instanceof StereotypeAttributeCompartmentEditPartCN) { + + if (childEditPart instanceof StereotypeAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((StereotypeAttributeCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((StereotypeAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } - if(childEditPart instanceof StereotypeOperationCompartmentEditPartCN) { + + if (childEditPart instanceof StereotypeOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way - pane.add(((StereotypeOperationCompartmentEditPartCN)childEditPart).getFigure()); + pane.add(((StereotypeOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } + return false; } @@ -183,17 +192,17 @@ public class StereotypeEditPartCN extends ClassEditPart { * @generated */ protected boolean removeFixedChild(EditPart childEditPart) { - if(childEditPart instanceof StereotypeNameEditPartCN) { + if (childEditPart instanceof StereotypeNameEditPartCN) { return true; } - if(childEditPart instanceof StereotypeAttributeCompartmentEditPartCN) { + if (childEditPart instanceof StereotypeAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - pane.remove(((StereotypeAttributeCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((StereotypeAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } - if(childEditPart instanceof StereotypeOperationCompartmentEditPartCN) { + if (childEditPart instanceof StereotypeOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - pane.remove(((StereotypeOperationCompartmentEditPartCN)childEditPart).getFigure()); + pane.remove(((StereotypeOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } return false; @@ -204,7 +213,7 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override protected void addChildVisual(EditPart childEditPart, int index) { - if(addFixedChild(childEditPart)) { + if (addFixedChild(childEditPart)) { return; } super.addChildVisual(childEditPart, -1); @@ -215,7 +224,7 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override protected void removeChildVisual(EditPart childEditPart) { - if(removeFixedChild(childEditPart)) { + if (removeFixedChild(childEditPart)) { return; } super.removeChildVisual(childEditPart); @@ -226,10 +235,10 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { - if(editPart instanceof StereotypeAttributeCompartmentEditPartCN) { + if (editPart instanceof StereotypeAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); } - if(editPart instanceof StereotypeOperationCompartmentEditPartCN) { + if (editPart instanceof StereotypeOperationCompartmentEditPartCN) { return getPrimaryShape().getOperationCompartmentFigure(); } return getContentPane(); @@ -255,6 +264,7 @@ public class StereotypeEditPartCN extends ClassEditPart { @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); + } /** @@ -267,7 +277,7 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override protected IFigure setupContentPane(IFigure nodeShape) { - if(nodeShape.getLayoutManager() == null) { + if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); layout.setSpacing(5); nodeShape.setLayoutManager(layout); @@ -280,7 +290,7 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override public IFigure getContentPane() { - if(contentPane != null) { + if (contentPane != null) { return contentPane; } return super.getContentPane(); @@ -291,7 +301,7 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override protected void setForegroundColor(Color color) { - if(primaryShape != null) { + if (primaryShape != null) { primaryShape.setForegroundColor(color); } } @@ -309,8 +319,8 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override protected void setLineType(int style) { - if(primaryShape instanceof IPapyrusNodeFigure) { - ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); + if (primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); } } @@ -327,14 +337,17 @@ public class StereotypeEditPartCN extends ClassEditPart { */ @Override public EditPart getTargetEditPart(Request request) { - if(request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); - IElementType type = (IElementType)adapter.getAdapter(IElementType.class); - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Property_3002)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeAttributeCompartmentEditPartCN.VISUAL_ID)); + if (request instanceof CreateViewAndElementRequest) { + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() + .getCreateElementRequestAdapter(); + IElementType type = (IElementType) adapter.getAdapter(IElementType.class); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ClassAttributeLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(StereotypeAttributeCompartmentEditPartCN.VISUAL_ID)); } - if(UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_3020)) { - return getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeOperationCompartmentEditPartCN.VISUAL_ID)); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_ClassOperationLabel)) { + return getChildBySemanticHint( + UMLVisualIDRegistry.getType(StereotypeOperationCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); 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 7f75104e450..e26dc37923f 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class StereotypeNameEditPart extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1034"; + public static final String VISUAL_ID = "Stereotype_NameLabel"; /** * @generated @@ -144,12 +146,12 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), StereotypeNameEditPart.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Stereotype_1026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPart.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Stereotype_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 4c581a3a147..4e43f284e4b 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 @@ -61,6 +61,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; @@ -81,12 +82,13 @@ import org.eclipse.uml2.uml.Feature; /** * @generated */ -public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit { +public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart + implements ITextAwareEditPart, IControlParserForDirectEdit { /** * @generated */ - public static final String VISUAL_ID = "1046"; + public static final String VISUAL_ID = "Stereotype_NameLabel_CN"; /** * @generated @@ -144,12 +146,12 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } @@ -157,12 +159,12 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } @@ -170,12 +172,12 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } @@ -183,12 +185,12 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -246,10 +248,11 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { - text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; @@ -261,12 +264,12 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -274,10 +277,11 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); + return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + getParserOptions().intValue()); } /** @@ -295,22 +299,25 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { - - @Override - public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); - } - }); + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + + @Override + public void run() { + setResult(parser.isValidEditString(ParserUtil.getParserAdapter( + getParserElement(), StereotypeNameEditPartCN.this), (String) value)); + } + }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); } catch (InterruptedException ie) { ie.printStackTrace(); } } + // shouldn't get here return null; } @@ -321,10 +328,10 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } - return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); + return getParser().getCompletionProcessor(ParserUtil.getParserAdapter(getParserElement(), this)); } /** @@ -338,8 +345,8 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public IParser getParser() { - if(parser == null) { - parser = UMLParserProvider.getParser(UMLElementTypes.Stereotype_1023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPartCN.VISUAL_ID)); + if (parser == null) { + parser = ParserUtil.getParser(UMLElementTypes.Stereotype_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -348,8 +355,10 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected DirectEditManager getManager() { - if(manager == null) { - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + if (manager == null) { + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); } return manager; } @@ -378,8 +387,8 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } @@ -387,8 +396,8 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -399,46 +408,58 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void performDirectEditRequest(Request request) { + final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager - setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this))); + setManager(new MultilineLabelDirectEditManager(this, + MultilineLabelDirectEditManager.getTextCellEditorClass(this), + UMLEditPartFactory.getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) + .createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { + dialog = new ExtendedDirectEditionDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), + configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), + ((ILabelEditorDialog) finalDialog).getValue()); + } }; domain.getCommandStack().execute(command); @@ -460,12 +481,13 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme // initialize the direct edit manager try { getEditingDomain().runExclusive(new Runnable() { - @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,12 +518,12 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme */ protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -510,12 +532,12 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } @@ -523,15 +545,15 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } @@ -540,9 +562,9 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } @@ -551,9 +573,10 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -571,11 +594,11 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); @@ -587,8 +610,8 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -601,7 +624,7 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme */ @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -627,13 +650,14 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } + // not a named element. no specific editor => do nothing return IDirectEdition.NO_DIRECT_EDITION; } @@ -645,7 +669,7 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement(), this); } return false; @@ -667,12 +691,15 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); + if (configuration == null) { + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("")) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, + resolveSemanticElement(), this); } } } @@ -683,10 +710,13 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void updateExtendedEditorConfiguration() { - String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + String languagePreferred = Activator.getDefault().getPreferenceStore().getString( + IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + if (languagePreferred != null && !languagePreferred.equals("") + && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), + this); + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } @@ -705,12 +735,15 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -748,24 +781,27 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -802,7 +838,8 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ protected void addOwnerElementListeners() { - addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); + addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); + } /** @@ -812,6 +849,7 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme public void deactivate() { removeOwnerElementListeners(); super.deactivate(); + } /** @@ -819,5 +857,6 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme */ protected void removeOwnerElementListeners() { removeListenerFilter(ADD_PARENT_MODEL); + } } 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 87f9c146d4b..0d3110a3a81 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 @@ -41,7 +41,7 @@ public class StereotypeOperationCompartmentEditPart extends ResizeableListCompar /** * @generated */ - public static final String VISUAL_ID = "1019"; + public static final String VISUAL_ID = "Stereotype_OperationCompartment"; /** * @generated @@ -86,7 +86,7 @@ public class StereotypeOperationCompartmentEditPart extends ResizeableListCompar */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class StereotypeOperationCompartmentEditPart extends ResizeableListCompar */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class StereotypeOperationCompartmentEditPart extends ResizeableListCompar @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class StereotypeOperationCompartmentEditPart extends ResizeableListCompar */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 6c52c89c6f9..5d4c34993b2 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 @@ -41,7 +41,7 @@ public class StereotypeOperationCompartmentEditPartCN extends ResizeableListComp /** * @generated */ - public static final String VISUAL_ID = "1053"; + public static final String VISUAL_ID = "Stereotype_OperationCompartment_CN"; /** * @generated @@ -86,7 +86,7 @@ public class StereotypeOperationCompartmentEditPartCN extends ResizeableListComp */ @Override protected void setRatio(Double ratio) { - if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { + if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); } } @@ -96,6 +96,7 @@ public class StereotypeOperationCompartmentEditPartCN extends ResizeableListComp */ @Override public EditPart getTargetEditPart(Request request) { + return super.getTargetEditPart(request); } @@ -105,7 +106,10 @@ public class StereotypeOperationCompartmentEditPartCN extends ResizeableListComp @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); - if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { + if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) + || NotationPackage.eINSTANCE.getSize_Height().equals(feature) + || NotationPackage.eINSTANCE.getLocation_X().equals(feature) + || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) { refreshBounds(); } super.handleNotificationEvent(notification); @@ -116,13 +120,13 @@ public class StereotypeOperationCompartmentEditPartCN extends ResizeableListComp */ @Override protected void refreshBounds() { - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); Dimension size = new Dimension(width, height); - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); } /** 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 8398b0c07d0..6e15b221ef7 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 @@ -34,217 +34,322 @@ public class UMLEditPartFactory implements EditPartFactory { * @generated */ public EditPart createEditPart(EditPart context, Object model) { - if(model instanceof View) { - View view = (View)model; - switch(UMLVisualIDRegistry.getVisualID(view)) { + if (model instanceof View) { + View view = (View) model; + switch (UMLVisualIDRegistry.getVisualID(view)) { + case ProfileDiagramEditPart.VISUAL_ID: return new ProfileDiagramEditPart(view); + case DependencyNodeEditPart.VISUAL_ID: return new DependencyNodeEditPart(view); + case MultiDependencyLabelEditPart.VISUAL_ID: return new MultiDependencyLabelEditPart(view); + case AssociationNodeEditPart.VISUAL_ID: return new AssociationNodeEditPart(view); + case StereotypeEditPart.VISUAL_ID: return new StereotypeEditPart(view); + case StereotypeNameEditPart.VISUAL_ID: return new StereotypeNameEditPart(view); + case ClassEditPart.VISUAL_ID: return new ClassEditPart(view); + case ClassNameEditPart.VISUAL_ID: return new ClassNameEditPart(view); + case MetaclassEditPart.VISUAL_ID: return new MetaclassEditPart(view); + case MetaclassNameEditPart.VISUAL_ID: return new MetaclassNameEditPart(view); + case CommentEditPart.VISUAL_ID: return new CommentEditPart(view); + case CommentBodyEditPart.VISUAL_ID: return new CommentBodyEditPart(view); + case ConstraintEditPart.VISUAL_ID: return new ConstraintEditPart(view); + case ConstraintNameEditPart.VISUAL_ID: return new ConstraintNameEditPart(view); + case ConstraintBodyEditPart.VISUAL_ID: return new ConstraintBodyEditPart(view); + case ModelEditPartTN.VISUAL_ID: return new ModelEditPartTN(view); + case ModelNameEditPart.VISUAL_ID: return new ModelNameEditPart(view); + case ProfileEditPartTN.VISUAL_ID: return new ProfileEditPartTN(view); + case ProfileNameEditPartTN.VISUAL_ID: return new ProfileNameEditPartTN(view); + case PackageEditPart.VISUAL_ID: return new PackageEditPart(view); + case PackageNameEditPart.VISUAL_ID: return new PackageNameEditPart(view); + case EnumerationEditPart.VISUAL_ID: return new EnumerationEditPart(view); + case EnumerationNameEditPart.VISUAL_ID: return new EnumerationNameEditPart(view); + case PrimitiveTypeEditPart.VISUAL_ID: return new PrimitiveTypeEditPart(view); + case PrimitiveTypeNameEditPart.VISUAL_ID: return new PrimitiveTypeNameEditPart(view); + case DataTypeEditPart.VISUAL_ID: return new DataTypeEditPart(view); + case DataTypeNameEditPart.VISUAL_ID: return new DataTypeNameEditPart(view); + case ShortCutDiagramEditPart.VISUAL_ID: return new ShortCutDiagramEditPart(view); + case DiagramNameEditPart.VISUAL_ID: return new DiagramNameEditPart(view); + case PrimitiveTypeEditPartCN.VISUAL_ID: return new PrimitiveTypeEditPartCN(view); + case PrimitiveTypeNameEditPartCN.VISUAL_ID: return new PrimitiveTypeNameEditPartCN(view); + case DataTypeOperationEditPart.VISUAL_ID: return new DataTypeOperationEditPart(view); + case EnumerationLiteralEditPart.VISUAL_ID: return new EnumerationLiteralEditPart(view); + case DataTypePropertyEditPart.VISUAL_ID: return new DataTypePropertyEditPart(view); + case ClassPropertyEditPart.VISUAL_ID: return new ClassPropertyEditPart(view); + case ClassOperationEditPart.VISUAL_ID: return new ClassOperationEditPart(view); + case StereotypeEditPartCN.VISUAL_ID: return new StereotypeEditPartCN(view); + case StereotypeNameEditPartCN.VISUAL_ID: return new StereotypeNameEditPartCN(view); + case ClassEditPartCN.VISUAL_ID: return new ClassEditPartCN(view); + case ClassNameEditPartCN.VISUAL_ID: return new ClassNameEditPartCN(view); + case MetaclassEditPartCN.VISUAL_ID: return new MetaclassEditPartCN(view); + case MetaclassNameEditPartCN.VISUAL_ID: return new MetaclassNameEditPartCN(view); + case CommentEditPartCN.VISUAL_ID: return new CommentEditPartCN(view); + case CommentBodyEditPartCN.VISUAL_ID: return new CommentBodyEditPartCN(view); + case ModelEditPartCN.VISUAL_ID: return new ModelEditPartCN(view); + case ModelNameEditPartCN.VISUAL_ID: return new ModelNameEditPartCN(view); + case ProfileEditPartCN.VISUAL_ID: return new ProfileEditPartCN(view); + case ProfileNameEditPartCN.VISUAL_ID: return new ProfileNameEditPartCN(view); + case PackageEditPartCN.VISUAL_ID: return new PackageEditPartCN(view); + case PackageNameEditPartCN.VISUAL_ID: return new PackageNameEditPartCN(view); + case ConstraintEditPartCN.VISUAL_ID: return new ConstraintEditPartCN(view); + case ConstraintNameEditPartCN.VISUAL_ID: return new ConstraintNameEditPartCN(view); + case ConstraintBodyEditPartCN.VISUAL_ID: return new ConstraintBodyEditPartCN(view); + case EnumerationEditPartCN.VISUAL_ID: return new EnumerationEditPartCN(view); + case EnumerationNameEditPartCN.VISUAL_ID: return new EnumerationNameEditPartCN(view); + case DataTypeEditPartCN.VISUAL_ID: return new DataTypeEditPartCN(view); + case DataTypeNameEditPartCN.VISUAL_ID: return new DataTypeNameEditPartCN(view); + case PackagePackageableElementCompartmentEditPart.VISUAL_ID: return new PackagePackageableElementCompartmentEditPart(view); + case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID: return new PackagePackageableElementCompartmentEditPartCN(view); + case ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID: return new ProfilePackageableElementCompartmentEditPartTN(view); + case ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID: return new ProfilePackageableElementCompartmentEditPartCN(view); + case StereotypeAttributeCompartmentEditPart.VISUAL_ID: return new StereotypeAttributeCompartmentEditPart(view); + case StereotypeAttributeCompartmentEditPartCN.VISUAL_ID: return new StereotypeAttributeCompartmentEditPartCN(view); + case StereotypeOperationCompartmentEditPart.VISUAL_ID: return new StereotypeOperationCompartmentEditPart(view); + case StereotypeOperationCompartmentEditPartCN.VISUAL_ID: return new StereotypeOperationCompartmentEditPartCN(view); + case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID: return new ModelPackageableElementCompartmentEditPartTN(view); + case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID: return new ModelPackageableElementCompartmentEditPartCN(view); + case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID: return new EnumerationEnumerationLiteralCompartmentEditPartCN(view); + case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID: return new EnumerationEnumerationLiteralCompartmentEditPart(view); + case DataTypeAttributeCompartmentEditPart.VISUAL_ID: return new DataTypeAttributeCompartmentEditPart(view); + case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID: return new DataTypeAttributeCompartmentEditPartCN(view); + case DataTypeOperationCompartmentEditPart.VISUAL_ID: return new DataTypeOperationCompartmentEditPart(view); + case DataTypeOperationCompartmentEditPartCN.VISUAL_ID: return new DataTypeOperationCompartmentEditPartCN(view); + case ClassAttributeCompartmentEditPart.VISUAL_ID: return new ClassAttributeCompartmentEditPart(view); + case ClassAttributeCompartmentEditPartCN.VISUAL_ID: return new ClassAttributeCompartmentEditPartCN(view); + case ClassOperationCompartmentEditPart.VISUAL_ID: return new ClassOperationCompartmentEditPart(view); + case ClassOperationCompartmentEditPartCN.VISUAL_ID: return new ClassOperationCompartmentEditPartCN(view); + case ExtensionEditPart.VISUAL_ID: return new ExtensionEditPart(view); + case AssociationEditPart.VISUAL_ID: return new AssociationEditPart(view); + case AssociationAppliedStereotypeEditPart.VISUAL_ID: return new AssociationAppliedStereotypeEditPart(view); + case AssociationNameEditPart.VISUAL_ID: return new AssociationNameEditPart(view); + case AssociationRoleTargetEditPart.VISUAL_ID: return new AssociationRoleTargetEditPart(view); + case AssociationRoleSourceEditPart.VISUAL_ID: return new AssociationRoleSourceEditPart(view); + case AssociationMultiplicitySourceEditPart.VISUAL_ID: return new AssociationMultiplicitySourceEditPart(view); + case AssociationMultiplicityTargetEditPart.VISUAL_ID: return new AssociationMultiplicityTargetEditPart(view); + case ProfileApplicationEditPart.VISUAL_ID: return new ProfileApplicationEditPart(view); + case AssociationBranchEditPart.VISUAL_ID: return new AssociationBranchEditPart(view); + case AssociationBranchRoleEditPart.VISUAL_ID: return new AssociationBranchRoleEditPart(view); + case AssociationBranchMultiplicityEditPart.VISUAL_ID: return new AssociationBranchMultiplicityEditPart(view); + case GeneralizationEditPart.VISUAL_ID: return new GeneralizationEditPart(view); + case GeneralizationAppliedStereotypeEditPart.VISUAL_ID: return new GeneralizationAppliedStereotypeEditPart(view); + case DependencyEditPart.VISUAL_ID: return new DependencyEditPart(view); + case DependencyNameEditPart.VISUAL_ID: return new DependencyNameEditPart(view); + case DependencyAppliedStereotypeEditPart.VISUAL_ID: return new DependencyAppliedStereotypeEditPart(view); + case DependencyBranchEditPart.VISUAL_ID: return new DependencyBranchEditPart(view); + case ElementImportEditPart.VISUAL_ID: return new ElementImportEditPart(view); + case ElementImportAliasEditPart.VISUAL_ID: return new ElementImportAliasEditPart(view); + case AppliedStereotypeElementImportEditPart.VISUAL_ID: return new AppliedStereotypeElementImportEditPart(view); + case PackageImportEditPart.VISUAL_ID: return new PackageImportEditPart(view); + case PackageImportAppliedStereotypeEditPart.VISUAL_ID: return new PackageImportAppliedStereotypeEditPart(view); + case CommentAnnotatedElementEditPart.VISUAL_ID: return new CommentAnnotatedElementEditPart(view); + case ConstraintConstrainedElementEditPart.VISUAL_ID: return new ConstraintConstrainedElementEditPart(view); + case ContextLinkEditPart.VISUAL_ID: return new ContextLinkEditPart(view); + case ContextLinkAppliedStereotypeEditPart.VISUAL_ID: return new ContextLinkAppliedStereotypeEditPart(view); + } } return createUnrecognizedEditPart(context, model); @@ -262,10 +367,11 @@ public class UMLEditPartFactory implements EditPartFactory { * @generated */ public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) { - if(source.getFigure() instanceof IMultilineEditableFigure) { - return new MultilineCellEditorLocator((IMultilineEditableFigure)source.getFigure()); + if (source.getFigure() instanceof IMultilineEditableFigure) { + return new MultilineCellEditorLocator((IMultilineEditableFigure) source.getFigure()); } else { return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source); + } } @@ -297,15 +403,15 @@ public class UMLEditPartFactory implements EditPartFactory { * @generated */ public void relocate(CellEditor celleditor) { - Text text = (Text)celleditor.getControl(); + Text text = (Text) celleditor.getControl(); Rectangle rect = getMultilineEditableFigure().getBounds().getCopy(); rect.x = getMultilineEditableFigure().getEditionLocation().x; rect.y = getMultilineEditableFigure().getEditionLocation().y; getMultilineEditableFigure().translateToAbsolute(rect); - if(getMultilineEditableFigure().getText().length() > 0) { + if (getMultilineEditableFigure().getText().length() > 0) { rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT))); } - if(!rect.equals(new Rectangle(text.getBounds()))) { + if (!rect.equals(new Rectangle(text.getBounds()))) { text.setBounds(rect.x, rect.y, rect.width, rect.height); } } 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 561e7a1a004..30b1af7bded 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 @@ -116,10 +116,10 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { @Override @SuppressWarnings("unchecked") public Command getCommand(Request request) { - if(request instanceof ReconnectRequest) { - Object view = ((ReconnectRequest)request).getConnectionEditPart().getModel(); - if(view instanceof View) { - String id = UMLVisualIDRegistry.getVisualID((View)view); + if (request instanceof ReconnectRequest) { + Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel(); + if (view instanceof View) { + String id = UMLVisualIDRegistry.getVisualID((View) view); request.getExtendedData().put(VISUAL_ID_KEY, id); request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view); } @@ -133,7 +133,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { * @generated */ protected String getVisualID(IEditCommandRequest request) { - return (String)request.getParameter(VISUAL_ID_KEY); + return (String) request.getParameter(VISUAL_ID_KEY); } /** @@ -144,8 +144,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { IEditCommandRequest completedRequest = completeRequest(request); Command semanticCommand = getSemanticCommandSwitch(completedRequest); semanticCommand = getEditHelperCommand(completedRequest, semanticCommand); - if(completedRequest instanceof DestroyRequest) { - DestroyRequest destroyRequest = (DestroyRequest)completedRequest; + if (completedRequest instanceof DestroyRequest) { + DestroyRequest destroyRequest = (DestroyRequest) completedRequest; return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null; } return semanticCommand; @@ -155,7 +155,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { * @generated */ protected Command addDeleteViewCommand(Command mainCommand, DestroyRequest completedRequest) { - Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View)getHost().getModel())); + Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View) getHost().getModel())); return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand); } @@ -163,8 +163,9 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { * @generated */ private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) { - if(editPolicyCommand != null) { - ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy)editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand); + if (editPolicyCommand != null) { + ICommand command = editPolicyCommand instanceof ICommandProxy + ? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand); request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command); } IElementType requestContextElementType = getContextElementType(request); @@ -172,8 +173,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { ICommand command = requestContextElementType.getEditCommand(request); request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null); request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null); - if(command != null) { - if(!(command instanceof CompositeTransactionalCommand)) { + if (command != null) { + if (!(command instanceof CompositeTransactionalCommand)) { command = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel()).compose(command); } return new ICommandProxy(command); @@ -193,28 +194,28 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { * @generated */ protected Command getSemanticCommandSwitch(IEditCommandRequest req) { - if(req instanceof CreateRelationshipRequest) { - return getCreateRelationshipCommand((CreateRelationshipRequest)req); - } else if(req instanceof CreateElementRequest) { - return getCreateCommand((CreateElementRequest)req); - } else if(req instanceof ConfigureRequest) { - return getConfigureCommand((ConfigureRequest)req); - } else if(req instanceof DestroyElementRequest) { - return getDestroyElementCommand((DestroyElementRequest)req); - } else if(req instanceof DestroyReferenceRequest) { - return getDestroyReferenceCommand((DestroyReferenceRequest)req); - } else if(req instanceof DuplicateElementsRequest) { - return getDuplicateCommand((DuplicateElementsRequest)req); - } else if(req instanceof GetEditContextRequest) { - return getEditContextCommand((GetEditContextRequest)req); - } else if(req instanceof MoveRequest) { - return getMoveCommand((MoveRequest)req); - } else if(req instanceof ReorientReferenceRelationshipRequest) { - return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest)req); - } else if(req instanceof ReorientRelationshipRequest) { - return getReorientRelationshipCommand((ReorientRelationshipRequest)req); - } else if(req instanceof SetRequest) { - return getSetCommand((SetRequest)req); + if (req instanceof CreateRelationshipRequest) { + return getCreateRelationshipCommand((CreateRelationshipRequest) req); + } else if (req instanceof CreateElementRequest) { + return getCreateCommand((CreateElementRequest) req); + } else if (req instanceof ConfigureRequest) { + return getConfigureCommand((ConfigureRequest) req); + } else if (req instanceof DestroyElementRequest) { + return getDestroyElementCommand((DestroyElementRequest) req); + } else if (req instanceof DestroyReferenceRequest) { + return getDestroyReferenceCommand((DestroyReferenceRequest) req); + } else if (req instanceof DuplicateElementsRequest) { + return getDuplicateCommand((DuplicateElementsRequest) req); + } else if (req instanceof GetEditContextRequest) { + return getEditContextCommand((GetEditContextRequest) req); + } else if (req instanceof MoveRequest) { + return getMoveCommand((MoveRequest) req); + } else if (req instanceof ReorientReferenceRelationshipRequest) { + return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req); + } else if (req instanceof ReorientRelationshipRequest) { + return getReorientRelationshipCommand((ReorientRelationshipRequest) req); + } else if (req instanceof SetRequest) { + return getSetCommand((SetRequest) req); } return null; } @@ -238,11 +239,11 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ protected Command getCreateCommand(CreateElementRequest req) { IElementType requestElementType = req.getElementType(); - if(requestElementType instanceof IElementType) { + if (requestElementType instanceof IElementType) { IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer()); - if(commandProvider != null) { + if (commandProvider != null) { ICommand command = commandProvider.getEditCommand(req); - if(command != null && command.canExecute()) { + if (command != null && command.canExecute()) { return new ICommandProxy(command); } } @@ -255,7 +256,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) { IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer()); - if(provider == null) { + if (provider == null) { return UnexecutableCommand.INSTANCE; } // Retrieve create command from the Element Edit service @@ -266,9 +267,10 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { /** * @generated */ - protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request, IElementType requestElementType) { + protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request, + IElementType requestElementType) { IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType); - if(provider == null) { + if (provider == null) { return UnexecutableCommand.INSTANCE; } // Retrieve create command from the Element Edit service @@ -279,9 +281,10 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { /** * @generated */ - protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request, IElementType requestElementType) { + protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request, + IElementType requestElementType) { IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType); - if(provider == null) { + if (provider == null) { return UnexecutableCommand.INSTANCE; } // Retrieve create command from the Element Edit service @@ -330,11 +333,11 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ protected Command getMoveCommand(MoveRequest req) { EObject targetCEObject = req.getTargetContainer(); - if(targetCEObject != null) { + if (targetCEObject != null) { IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject); - if(provider != null) { + if (provider != null) { ICommand moveCommand = provider.getEditCommand(req); - if(moveCommand != null) { + if (moveCommand != null) { return new ICommandProxy(moveCommand); } } @@ -342,6 +345,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } else { return getGEFWrapper(new MoveElementsCommand(req)); } + } /** @@ -371,7 +375,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { * @generated */ protected TransactionalEditingDomain getEditingDomain() { - return ((IGraphicalEditPart)getHost()).getEditingDomain(); + return ((IGraphicalEditPart) getHost()).getEditingDomain(); } /** @@ -381,9 +385,10 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) { assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$ - for(Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) { - View nextView = (View)it.next(); - if(nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$ + for (Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) { + View nextView = (View) it.next(); + if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() //$NON-NLS-1$ + || nextView.getElement() != view.getElement()) { continue; } cmd.add(new DeleteCommand(getEditingDomain(), nextView)); @@ -395,7 +400,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ public static LinkConstraints getLinkConstraints() { LinkConstraints cached = UMLDiagramEditorPlugin.getInstance().getLinkConstraints(); - if(cached == null) { + if (cached == null) { UMLDiagramEditorPlugin.getInstance().setLinkConstraints(cached = new LinkConstraints()); } return cached; @@ -413,111 +418,115 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canCreateExtension_1013(Package container, Property source, Class target) { - return canExistExtension_1013(container, null, source, target); + * @generated + */ + public boolean canCreateExtension_Edge(Package container, Property source, Class target) { + return canExistExtension_Edge(container, null, source, target); } /** - * @generated - */ - public boolean canCreateAssociation_4001(Package container, Type source, Type target) { - return canExistAssociation_4001(container, null, source, target); + * @generated + */ + public boolean canCreateAssociation_Edge(Package container, Type source, Type target) { + return canExistAssociation_Edge(container, null, source, target); } /** - * @generated - */ - public boolean canCreateProfileApplication_1045(Package container, Package source, Profile target) { - return canExistProfileApplication_1045(container, null, source, target); + * @generated + */ + public boolean canCreateProfileApplication_Edge(Package container, Package source, Profile target) { + return canExistProfileApplication_Edge(container, null, source, target); } /** - * @generated - */ - public boolean canCreateAssociation_4019(Package container, Type source, Type target) { - return canExistAssociation_4019(container, null, source, target); + * @generated + */ + public boolean canCreateAssociation_BranchEdge(Package container, Type source, Type target) { + return canExistAssociation_BranchEdge(container, null, source, target); } /** - * @generated - */ - public boolean canCreateGeneralization_4002(Classifier source, Classifier target) { - return canExistGeneralization_4002(null, source, target); + * @generated + */ + public boolean canCreateGeneralization_Edge(Classifier source, Classifier target) { + return canExistGeneralization_Edge(null, source, target); } /** - * @generated - */ - public boolean canCreateDependency_4008(Package container, NamedElement source, NamedElement target) { - return canExistDependency_4008(container, null, source, target); + * @generated + */ + public boolean canCreateDependency_Edge(Package container, NamedElement source, NamedElement target) { + return canExistDependency_Edge(container, null, source, target); } /** - * @generated - */ - public boolean canCreateDependency_4018(Package container, NamedElement source, NamedElement target) { - return canExistDependency_4018(container, null, source, target); + * @generated + */ + public boolean canCreateDependency_BranchEdge(Package container, NamedElement source, NamedElement target) { + return canExistDependency_BranchEdge(container, null, source, target); } /** - * @generated - */ - public boolean canCreateElementImport_1064(Namespace container, Namespace source, PackageableElement target) { - return canExistElementImport_1064(container, null, source, target); + * @generated + */ + public boolean canCreateElementImport_Edge(Namespace container, Namespace source, PackageableElement target) { + return canExistElementImport_Edge(container, null, source, target); } /** - * @generated - */ - public boolean canCreatePackageImport_1065(Namespace container, Namespace source, Package target) { - return canExistPackageImport_1065(container, null, source, target); + * @generated + */ + public boolean canCreatePackageImport_Edge(Namespace container, Namespace source, Package target) { + return canExistPackageImport_Edge(container, null, source, target); } /** - * @generated - */ - public boolean canCreateCommentAnnotatedElement_1022(Comment source, Element target) { - if(source != null) { - if(source.getAnnotatedElements().contains(target)) { + * @generated + */ + public boolean canCreateComment_AnnotatedElementEdge(Comment source, Element target) { + if (source != null) { + if (source.getAnnotatedElements().contains(target)) { return false; } } - return canExistCommentAnnotatedElement_1022(source, target); + + return canExistComment_AnnotatedElementEdge(source, target); } /** - * @generated - */ - public boolean canCreateConstraintConstrainedElement_4014(Constraint source, Element target) { - if(source != null) { - if(source.getConstrainedElements().contains(target)) { + * @generated + */ + public boolean canCreateConstraint_ConstrainedElementEdge(Constraint source, Element target) { + if (source != null) { + if (source.getConstrainedElements().contains(target)) { return false; } } - return canExistConstraintConstrainedElement_4014(source, target); + + return canExistConstraint_ConstrainedElementEdge(source, target); } /** - * @generated - */ - public boolean canCreateConstraintContext_8500(Constraint source, Namespace target) { - if(source != null) { - if(source.getContext() != null) { + * @generated + */ + public boolean canCreateConstraint_ContextEdge(Constraint source, Namespace target) { + if (source != null) { + if (source.getContext() != null) { return false; } } - if(target != null && (target.getOwnedRules().contains(target))) { + if (target != null && (target.getOwnedRules().contains(target))) { return false; } - return canExistConstraintContext_8500(source, target); + + return canExistConstraint_ContextEdge(source, target); } /** - * @generated - */ - public boolean canExistExtension_1013(Package container, Extension linkInstance, Property source, Class target) { + * @generated + */ + public boolean canExistExtension_Edge(Package container, Extension linkInstance, Property source, + Class target) { try { //ExtensionSource /**we can't make a test here, because, the source must be a Property (ExtensionEnd) and it's a Stereotype @@ -525,6 +534,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { * @see org.eclipse.papyrus.uml.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test! */ //ExtensionTarget + /**we can't make a test here, because, the source must be a Property (ExtensionEnd) and it's a Stereotype * * @see org.eclipse.papyrus.uml.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test! @@ -537,20 +547,20 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistAssociation_4001(Package container, Association linkInstance, Type source, Type target) { + * @generated + */ + public boolean canExistAssociation_Edge(Package container, Association linkInstance, Type source, Type target) { try { //AssociationSource - if((source instanceof Type) && Util.isMetaclass((Type)source)) { + if ((source instanceof Type) && Util.isMetaclass((Type) source)) { return false; } - if(source instanceof Extension) { + if (source instanceof Extension) { return false; } //AssociationTarget - if(target != null) { - if(target instanceof Extension) { + if (target != null) { + if (target instanceof Extension) { return false; } } @@ -562,27 +572,29 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistProfileApplication_1045(Package container, ProfileApplication linkInstance, Package source, Profile target) { + * @generated + */ + public boolean canExistProfileApplication_Edge(Package container, ProfileApplication linkInstance, + Package source, Profile target) { return true; } /** - * @generated - */ - public boolean canExistAssociation_4019(Package container, Association linkInstance, Type source, Type target) { + * @generated + */ + public boolean canExistAssociation_BranchEdge(Package container, Association linkInstance, Type source, + Type target) { try { //AssociationSource - if((source instanceof Type) && Util.isMetaclass((Type)source)) { + if ((source instanceof Type) && Util.isMetaclass((Type) source)) { return false; } - if(source instanceof Extension) { + if (source instanceof Extension) { return false; } //AssociationTarget - if(target != null) { - if(target instanceof Extension) { + if (target != null) { + if (target instanceof Extension) { return false; } } @@ -594,29 +606,29 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistGeneralization_4002(Generalization linkInstance, Classifier source, Classifier target) { + * @generated + */ + public boolean canExistGeneralization_Edge(Generalization linkInstance, Classifier source, Classifier target) { try { //GeneralizationSource - if(!(source instanceof Classifier)) { + if (!(source instanceof Classifier)) { return false; } - if(Util.isMetaclass(source)) { + if (Util.isMetaclass(source)) { return false; } - if(source instanceof Extension) { + if (source instanceof Extension) { return false; //meaningless } //GeneralizationTarget - if(target != null) { - if(!(target instanceof Classifier)) { + if (target != null) { + if (!(target instanceof Classifier)) { return false; } - if(Util.isMetaclass(target)) { + if (Util.isMetaclass(target)) { return false; } - if(target instanceof Extension) { + if (target instanceof Extension) { return false;//meaningless } } @@ -628,20 +640,21 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistDependency_4008(Package container, Dependency linkInstance, NamedElement source, NamedElement target) { + * @generated + */ + public boolean canExistDependency_Edge(Package container, Dependency linkInstance, NamedElement source, + NamedElement target) { try { //DependencySource - if((source instanceof Type) && Util.isMetaclass((Type)source)) { + if ((source instanceof Type) && Util.isMetaclass((Type) source)) { return false; } - if(source instanceof Extension) { + if (source instanceof Extension) { return false; } //DependencyTarget - if(target != null) { - if(target instanceof Extension) { + if (target != null) { + if (target instanceof Extension) { return false; } } @@ -653,20 +666,21 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistDependency_4018(Package container, Dependency linkInstance, NamedElement source, NamedElement target) { + * @generated + */ + public boolean canExistDependency_BranchEdge(Package container, Dependency linkInstance, NamedElement source, + NamedElement target) { try { //DependencySource - if((source instanceof Type) && Util.isMetaclass((Type)source)) { + if ((source instanceof Type) && Util.isMetaclass((Type) source)) { return false; } - if(source instanceof Extension) { + if (source instanceof Extension) { return false; } //DependencyTarget - if(target != null) { - if(target instanceof Extension) { + if (target != null) { + if (target instanceof Extension) { return false; } } @@ -678,20 +692,21 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistElementImport_1064(Namespace container, ElementImport linkInstance, Namespace source, PackageableElement target) { + * @generated + */ + public boolean canExistElementImport_Edge(Namespace container, ElementImport linkInstance, Namespace source, + PackageableElement target) { try { //ElementImportSource - if((source instanceof Type) && Util.isMetaclass((Type)source)) { + if ((source instanceof Type) && Util.isMetaclass((Type) source)) { return false; } - if(source instanceof Extension) { + if (source instanceof Extension) { return false; } //ElementImportTarget - if(target != null) { - if(target instanceof Extension) { + if (target != null) { + if (target instanceof Extension) { return false; } } @@ -703,15 +718,16 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistPackageImport_1065(Namespace container, PackageImport linkInstance, Namespace source, Package target) { + * @generated + */ + public boolean canExistPackageImport_Edge(Namespace container, PackageImport linkInstance, Namespace source, + Package target) { try { //PackageImportSource - if((source instanceof Type) && Util.isMetaclass((Type)source)) { + if ((source instanceof Type) && Util.isMetaclass((Type) source)) { return false; } - if(source instanceof Extension) { + if (source instanceof Extension) { return false; } return true; @@ -722,12 +738,12 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistCommentAnnotatedElement_1022(Comment source, Element target) { + * @generated + */ + public boolean canExistComment_AnnotatedElementEdge(Comment source, Element target) { try { //AnnotatedElementLink target - if((target instanceof Type) && Util.isMetaclass((Type)target)) { + if ((target instanceof Type) && Util.isMetaclass((Type) target)) { return false; } return true; @@ -738,12 +754,12 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistConstraintConstrainedElement_4014(Constraint source, Element target) { + * @generated + */ + public boolean canExistConstraint_ConstrainedElementEdge(Constraint source, Element target) { try { //ConstraintedElementLink - if((target instanceof Type) && Util.isMetaclass((Type)target)) { + if ((target instanceof Type) && Util.isMetaclass((Type) target)) { return false; } return true; @@ -754,9 +770,9 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } /** - * @generated - */ - public boolean canExistConstraintContext_8500(Constraint source, Namespace target) { + * @generated + */ + public boolean canExistConstraint_ContextEdge(Constraint source, Namespace target) { return true; } } 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 2c4e043a312..e3a38aa55c4 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 @@ -54,9 +54,9 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl */ @Override protected void showPrimarySelection() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setSelected(true); - ((WrappingLabel)getHostFigure()).setFocus(true); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setSelected(true); + ((WrappingLabel) getHostFigure()).setFocus(true); } else { showSelection(); showFocus(); @@ -68,9 +68,9 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl */ @Override protected void showSelection() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setSelected(true); - ((WrappingLabel)getHostFigure()).setFocus(false); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setSelected(true); + ((WrappingLabel) getHostFigure()).setFocus(false); } else { hideSelection(); addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure()); @@ -85,11 +85,11 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl */ @Override protected void hideSelection() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setSelected(false); - ((WrappingLabel)getHostFigure()).setFocus(false); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setSelected(false); + ((WrappingLabel) getHostFigure()).setFocus(false); } else { - if(selectionFeedbackFigure != null) { + if (selectionFeedbackFigure != null) { removeFeedback(selectionFeedbackFigure); getHostFigure().removeFigureListener(getHostPositionListener()); selectionFeedbackFigure = null; @@ -103,8 +103,8 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl */ @Override protected void showFocus() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setFocus(true); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setFocus(true); } else { hideFocus(); addFeedback(focusFeedbackFigure = createFocusFeedbackFigure()); @@ -117,10 +117,10 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl */ @Override protected void hideFocus() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setFocus(false); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setFocus(false); } else { - if(focusFeedbackFigure != null) { + if (focusFeedbackFigure != null) { removeFeedback(focusFeedbackFigure); focusFeedbackFigure = null; } @@ -132,8 +132,8 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl */ protected Rectangle getFeedbackBounds() { Rectangle bounds; - if(getHostFigure() instanceof Label) { - bounds = ((Label)getHostFigure()).getTextBounds(); + if (getHostFigure() instanceof Label) { + bounds = ((Label) getHostFigure()).getTextBounds(); bounds.intersect(getHostFigure().getBounds()); } else { bounds = getHostFigure().getBounds().getCopy(); @@ -147,7 +147,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl * @generated */ protected IFigure createSelectionFeedbackFigure() { - if(getHostFigure() instanceof Label) { + if (getHostFigure() instanceof Label) { Label feedbackFigure = new Label(); feedbackFigure.setOpaque(true); feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected); @@ -177,7 +177,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl * @generated */ protected void updateLabel(Label target) { - Label source = (Label)getHostFigure(); + Label source = (Label) getHostFigure(); target.setText(source.getText()); target.setTextAlignment(source.getTextAlignment()); target.setFont(source.getFont()); @@ -187,9 +187,9 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl * @generated */ protected void refreshSelectionFeedback() { - if(selectionFeedbackFigure != null) { - if(selectionFeedbackFigure instanceof Label) { - updateLabel((Label)selectionFeedbackFigure); + if (selectionFeedbackFigure != null) { + if (selectionFeedbackFigure instanceof Label) { + updateLabel((Label) selectionFeedbackFigure); selectionFeedbackFigure.setBounds(getFeedbackBounds()); } else { selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5)); @@ -201,7 +201,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl * @generated */ protected void refreshFocusFeedback() { - if(focusFeedbackFigure != null) { + if (focusFeedbackFigure != null) { focusFeedbackFigure.setBounds(getFeedbackBounds()); } } @@ -219,9 +219,8 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl * @generated */ private FigureListener getHostPositionListener() { - if(hostPositionListener == null) { + if (hostPositionListener == null) { hostPositionListener = new FigureListener() { - @Override public void figureMoved(IFigure source) { refreshFeedback(); @@ -236,7 +235,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl */ @Override protected List<?> createSelectionHandles() { - MoveHandle moveHandle = new MoveHandle((GraphicalEditPart)getHost()); + MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost()); moveHandle.setBorder(null); moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost())); return Collections.singletonList(moveHandle); 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 d7458940710..7db43835398 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 @@ -48,9 +48,9 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I */ @Override protected void showPrimarySelection() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setSelected(true); - ((WrappingLabel)getHostFigure()).setFocus(true); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setSelected(true); + ((WrappingLabel) getHostFigure()).setFocus(true); } else { showSelection(); showFocus(); @@ -62,9 +62,9 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I */ @Override protected void showSelection() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setSelected(true); - ((WrappingLabel)getHostFigure()).setFocus(false); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setSelected(true); + ((WrappingLabel) getHostFigure()).setFocus(false); } else { hideSelection(); addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure()); @@ -79,11 +79,11 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I */ @Override protected void hideSelection() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setSelected(false); - ((WrappingLabel)getHostFigure()).setFocus(false); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setSelected(false); + ((WrappingLabel) getHostFigure()).setFocus(false); } else { - if(selectionFeedbackFigure != null) { + if (selectionFeedbackFigure != null) { removeFeedback(selectionFeedbackFigure); getHostFigure().removeFigureListener(getHostPositionListener()); selectionFeedbackFigure = null; @@ -97,8 +97,8 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I */ @Override protected void showFocus() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setFocus(true); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setFocus(true); } else { hideFocus(); addFeedback(focusFeedbackFigure = createFocusFeedbackFigure()); @@ -111,10 +111,10 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I */ @Override protected void hideFocus() { - if(getHostFigure() instanceof WrappingLabel) { - ((WrappingLabel)getHostFigure()).setFocus(false); + if (getHostFigure() instanceof WrappingLabel) { + ((WrappingLabel) getHostFigure()).setFocus(false); } else { - if(focusFeedbackFigure != null) { + if (focusFeedbackFigure != null) { removeFeedback(focusFeedbackFigure); focusFeedbackFigure = null; } @@ -126,8 +126,8 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I */ protected Rectangle getFeedbackBounds() { Rectangle bounds; - if(getHostFigure() instanceof Label) { - bounds = ((Label)getHostFigure()).getTextBounds(); + if (getHostFigure() instanceof Label) { + bounds = ((Label) getHostFigure()).getTextBounds(); bounds.intersect(getHostFigure().getBounds()); } else { bounds = getHostFigure().getBounds().getCopy(); @@ -141,7 +141,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I * @generated */ protected IFigure createSelectionFeedbackFigure() { - if(getHostFigure() instanceof Label) { + if (getHostFigure() instanceof Label) { Label feedbackFigure = new Label(); feedbackFigure.setOpaque(true); feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected); @@ -171,7 +171,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I * @generated */ protected void updateLabel(Label target) { - Label source = (Label)getHostFigure(); + Label source = (Label) getHostFigure(); target.setText(source.getText()); target.setTextAlignment(source.getTextAlignment()); target.setFont(source.getFont()); @@ -181,9 +181,9 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I * @generated */ protected void refreshSelectionFeedback() { - if(selectionFeedbackFigure != null) { - if(selectionFeedbackFigure instanceof Label) { - updateLabel((Label)selectionFeedbackFigure); + if (selectionFeedbackFigure != null) { + if (selectionFeedbackFigure instanceof Label) { + updateLabel((Label) selectionFeedbackFigure); selectionFeedbackFigure.setBounds(getFeedbackBounds()); } else { selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5)); @@ -195,7 +195,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I * @generated */ protected void refreshFocusFeedback() { - if(focusFeedbackFigure != null) { + if (focusFeedbackFigure != null) { focusFeedbackFigure.setBounds(getFeedbackBounds()); } } @@ -213,9 +213,8 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I * @generated */ private FigureListener getHostPositionListener() { - if(hostPositionListener == null) { + if (hostPositionListener == null) { hostPositionListener = new FigureListener() { - @Override public void figureMoved(IFigure source) { refreshFeedback(); 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 430011efd3d..29eed6a22bd 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 @@ -26,9 +26,8 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject { */ static { @SuppressWarnings("rawtypes") - final Class[] supportedTypes = new Class[]{ ITabbedPropertySheetPageContributor.class }; + final Class[] supportedTypes = new Class[] { ITabbedPropertySheetPageContributor.class }; final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() { - @Override public String getContributorId() { return "org.eclipse.papyrus.uml.diagram.profile"; //$NON-NLS-1$ @@ -39,7 +38,8 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject { @Override @SuppressWarnings("rawtypes") public Object getAdapter(Object adaptableObject, Class adapterType) { - if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) { + if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem + && adapterType == ITabbedPropertySheetPageContributor.class) { return propertySheetPageContributor; } return null; 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 d87684bd37d..71da593e0ef 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 @@ -71,17 +71,18 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider * @generated */ public UMLDomainNavigatorContentProvider() { - myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); + myAdapterFctoryContentProvier = new AdapterFactoryContentProvider( + UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain(); - myEditingDomain = (AdapterFactoryEditingDomain)editingDomain; + myEditingDomain = (AdapterFactoryEditingDomain) editingDomain; @SuppressWarnings("serial") Map<Resource, Boolean> map = new HashMap<Resource, Boolean>() { @Override public Boolean get(java.lang.Object key) { - if(!containsKey(key)) { - if(key instanceof Resource) { - put((Resource)key, Boolean.TRUE); + if (!containsKey(key)) { + if (key instanceof Resource) { + put((Resource) key, Boolean.TRUE); } } return super.get(key); @@ -92,7 +93,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider @Override public void run() { - if(myViewer != null) { + if (myViewer != null) { myViewer.refresh(); } } @@ -105,11 +106,12 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider @Override public boolean handleResourceChanged(final Resource resource) { - for(Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it + .hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } - if(myViewer != null) { + if (myViewer != null) { myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable); } return true; @@ -117,11 +119,12 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider @Override public boolean handleResourceDeleted(Resource resource) { - for(Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it + .hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } - if(myViewer != null) { + if (myViewer != null) { myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable); } return true; @@ -129,11 +132,12 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider @Override public boolean handleResourceMoved(Resource resource, final URI newURI) { - for(Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it + .hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } - if(myViewer != null) { + if (myViewer != null) { myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable); } return true; @@ -148,11 +152,13 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider myWorkspaceSynchronizer.dispose(); myWorkspaceSynchronizer = null; myViewerRefreshRunnable = null; - for(Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { + + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { Resource resource = it.next(); resource.unload(); } - ((TransactionalEditingDomain)myEditingDomain).dispose(); + + ((TransactionalEditingDomain) myEditingDomain).dispose(); myEditingDomain = null; } @@ -167,7 +173,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider * @generated */ void unloadAllResources() { - for(Resource nextResource : myEditingDomain.getResourceSet().getResources()) { + for (Resource nextResource : myEditingDomain.getResourceSet().getResources()) { nextResource.unload(); } } @@ -176,7 +182,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider * @generated */ void asyncRefresh() { - if(myViewer != null && !myViewer.getControl().isDisposed()) { + if (myViewer != null && !myViewer.getControl().isDisposed()) { myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable); } } @@ -210,14 +216,17 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider * @generated */ public Object[] getChildren(Object parentElement) { - if(parentElement instanceof IFile) { - IFile file = (IFile)parentElement; + if (parentElement instanceof IFile) { + IFile file = (IFile) parentElement; URI fileURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true); Resource resource = myEditingDomain.getResourceSet().getResource(fileURI, true); return wrapEObjects(myAdapterFctoryContentProvier.getChildren(resource), parentElement); } - if(parentElement instanceof UMLDomainNavigatorItem) { - return wrapEObjects(myAdapterFctoryContentProvier.getChildren(((UMLDomainNavigatorItem)parentElement).getEObject()), parentElement); + + if (parentElement instanceof UMLDomainNavigatorItem) { + return wrapEObjects( + myAdapterFctoryContentProvier.getChildren(((UMLDomainNavigatorItem) parentElement).getEObject()), + parentElement); } return EMPTY_ARRAY; } @@ -227,9 +236,10 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider */ public Object[] wrapEObjects(Object[] objects, Object parentElement) { Collection<UMLDomainNavigatorItem> result = new ArrayList<UMLDomainNavigatorItem>(); - for(int i = 0; i < objects.length; i++) { - if(objects[i] instanceof EObject) { - result.add(new UMLDomainNavigatorItem((EObject)objects[i], parentElement, myAdapterFctoryContentProvier)); + for (int i = 0; i < objects.length; i++) { + if (objects[i] instanceof EObject) { + result.add( + new UMLDomainNavigatorItem((EObject) objects[i], parentElement, myAdapterFctoryContentProvier)); } } return result.toArray(); @@ -239,8 +249,8 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider * @generated */ public Object getParent(Object element) { - if(element instanceof UMLAbstractNavigatorItem) { - UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem)element; + if (element instanceof UMLAbstractNavigatorItem) { + UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem) element; return abstractNavigatorItem.getParent(); } return null; 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 4d364ccafb0..071f3ee6bc2 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 @@ -29,22 +29,23 @@ public class UMLDomainNavigatorItem extends PlatformObject { */ static { @SuppressWarnings("rawtypes") - final Class[] supportedTypes = new Class[]{ EObject.class, IPropertySource.class }; + final Class[] supportedTypes = new Class[] { EObject.class, IPropertySource.class }; Platform.getAdapterManager().registerAdapters(new IAdapterFactory() { @Override @SuppressWarnings("rawtypes") public Object getAdapter(Object adaptableObject, Class adapterType) { - if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem) { - org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem)adaptableObject; + if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem) { + org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem) adaptableObject; EObject eObject = domainNavigatorItem.getEObject(); - if(adapterType == EObject.class) { + if (adapterType == EObject.class) { return eObject; } - if(adapterType == IPropertySource.class) { + if (adapterType == IPropertySource.class) { return domainNavigatorItem.getPropertySourceProvider().getPropertySource(eObject); } } + return null; } @@ -106,8 +107,9 @@ public class UMLDomainNavigatorItem extends PlatformObject { */ @Override public boolean equals(Object obj) { - if(obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem) { - return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem)obj).getEObject())); + if (obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem) { + return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI( + ((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem) obj).getEObject())); } return super.equals(obj); } 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 7810d5650cc..086f648b401 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 @@ -27,7 +27,8 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { /** * @generated */ - private AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); + private AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new AdapterFactoryLabelProvider( + UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); /** * @generated @@ -39,8 +40,8 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { * @generated */ public Image getImage(Object element) { - if(element instanceof UMLDomainNavigatorItem) { - return myAdapterFactoryLabelProvider.getImage(((UMLDomainNavigatorItem)element).getEObject()); + if (element instanceof UMLDomainNavigatorItem) { + return myAdapterFactoryLabelProvider.getImage(((UMLDomainNavigatorItem) element).getEObject()); } return null; } @@ -49,8 +50,8 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { * @generated */ public String getText(Object element) { - if(element instanceof UMLDomainNavigatorItem) { - return myAdapterFactoryLabelProvider.getText(((UMLDomainNavigatorItem)element).getEObject()); + if (element instanceof UMLDomainNavigatorItem) { + return myAdapterFactoryLabelProvider.getText(((UMLDomainNavigatorItem) element).getEObject()); } return null; } 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 81e51ff8eb6..51a91934979 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 @@ -59,9 +59,9 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { @Override public void init(ICommonActionExtensionSite aSite) { super.init(aSite); - if(aSite.getViewSite() instanceof ICommonViewerWorkbenchSite) { + if (aSite.getViewSite() instanceof ICommonViewerWorkbenchSite) { myContribute = true; - makeActions((ICommonViewerWorkbenchSite)aSite.getViewSite()); + makeActions((ICommonViewerWorkbenchSite) aSite.getViewSite()); } else { myContribute = false; } @@ -79,12 +79,12 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { */ @Override public void fillActionBars(IActionBars actionBars) { - if(!myContribute) { + if (!myContribute) { return; } - IStructuredSelection selection = (IStructuredSelection)getContext().getSelection(); + IStructuredSelection selection = (IStructuredSelection) getContext().getSelection(); myOpenDiagramAction.selectionChanged(selection); - if(myOpenDiagramAction.isEnabled()) { + if (myOpenDiagramAction.isEnabled()) { actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, myOpenDiagramAction); } } @@ -124,16 +124,16 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { */ public final void selectionChanged(IStructuredSelection selection) { myDiagram = null; - if(selection.size() == 1) { + if (selection.size() == 1) { Object selectedElement = selection.getFirstElement(); - if(selectedElement instanceof UMLNavigatorItem) { - selectedElement = ((UMLNavigatorItem)selectedElement).getView(); - } else if(selectedElement instanceof IAdaptable) { - selectedElement = ((IAdaptable)selectedElement).getAdapter(View.class); + if (selectedElement instanceof UMLNavigatorItem) { + selectedElement = ((UMLNavigatorItem) selectedElement).getView(); + } else if (selectedElement instanceof IAdaptable) { + selectedElement = ((IAdaptable) selectedElement).getAdapter(View.class); } - if(selectedElement instanceof Diagram) { - Diagram diagram = (Diagram)selectedElement; - if(ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(diagram))) { + if (selectedElement instanceof Diagram) { + Diagram diagram = (Diagram) selectedElement; + if (ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(diagram))) { myDiagram = diagram; } } @@ -146,9 +146,10 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { */ @Override public void run() { - if(myDiagram == null || myDiagram.eResource() == null) { + if (myDiagram == null || myDiagram.eResource() == null) { return; } + IEditorInput editorInput = getEditorInput(myDiagram); IWorkbenchPage page = myViewerSite.getPage(); try { @@ -163,11 +164,11 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { */ private static IEditorInput getEditorInput(Diagram diagram) { Resource diagramResource = diagram.eResource(); - for(EObject nextEObject : diagramResource.getContents()) { - if(nextEObject == diagram) { + for (EObject nextEObject : diagramResource.getContents()) { + if (nextEObject == diagram) { return new FileEditorInput(WorkspaceSynchronizer.getFile(diagramResource)); } - if(nextEObject instanceof Diagram) { + if (nextEObject instanceof Diagram) { break; } } 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 4083881a91c..659bd95d7a0 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 @@ -69,15 +69,15 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { */ public UMLNavigatorContentProvider() { TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain(); - myEditingDomain = (AdapterFactoryEditingDomain)editingDomain; + myEditingDomain = (AdapterFactoryEditingDomain) editingDomain; @SuppressWarnings("serial") Map<Resource, Boolean> map = new HashMap<Resource, Boolean>() { @Override public Boolean get(java.lang.Object key) { - if(!containsKey(key)) { - if(key instanceof Resource) { - put((Resource)key, Boolean.TRUE); + if (!containsKey(key)) { + if (key instanceof Resource) { + put((Resource) key, Boolean.TRUE); } } return super.get(key); @@ -88,7 +88,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { @Override public void run() { - if(myViewer != null) { + if (myViewer != null) { myViewer.refresh(); } } @@ -101,11 +101,12 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { @Override public boolean handleResourceChanged(final Resource resource) { - for(Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it + .hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } - if(myViewer != null) { + if (myViewer != null) { myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable); } return true; @@ -113,11 +114,12 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { @Override public boolean handleResourceDeleted(Resource resource) { - for(Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it + .hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } - if(myViewer != null) { + if (myViewer != null) { myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable); } return true; @@ -125,11 +127,12 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { @Override public boolean handleResourceMoved(Resource resource, final URI newURI) { - for(Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it + .hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } - if(myViewer != null) { + if (myViewer != null) { myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable); } return true; @@ -144,11 +147,13 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { myWorkspaceSynchronizer.dispose(); myWorkspaceSynchronizer = null; myViewerRefreshRunnable = null; - for(Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { + + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { Resource resource = it.next(); resource.unload(); } - ((TransactionalEditingDomain)myEditingDomain).dispose(); + + ((TransactionalEditingDomain) myEditingDomain).dispose(); myEditingDomain = null; } @@ -163,7 +168,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { * @generated */ void unloadAllResources() { - for(Resource nextResource : myEditingDomain.getResourceSet().getResources()) { + for (Resource nextResource : myEditingDomain.getResourceSet().getResources()) { nextResource.unload(); } } @@ -172,7 +177,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { * @generated */ void asyncRefresh() { - if(myViewer != null && !myViewer.getControl().isDisposed()) { + if (myViewer != null && !myViewer.getControl().isDisposed()) { myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable); } } @@ -206,30 +211,33 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { * @generated */ public Object[] getChildren(Object parentElement) { - if(parentElement instanceof IFile) { - IFile file = (IFile)parentElement; + if (parentElement instanceof IFile) { + IFile file = (IFile) parentElement; URI fileURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true); Resource resource = myEditingDomain.getResourceSet().getResource(fileURI, true); Collection<Object> result = new ArrayList<Object>(); List<View> topViews = new ArrayList<View>(resource.getContents().size()); - for(EObject o : resource.getContents()) { - if(o instanceof View) { - topViews.add((View)o); + for (EObject o : resource.getContents()) { + if (o instanceof View) { + topViews.add((View) o); } } return result.toArray(); } - if(parentElement instanceof UMLNavigatorGroup) { - UMLNavigatorGroup group = (UMLNavigatorGroup)parentElement; + + if (parentElement instanceof UMLNavigatorGroup) { + UMLNavigatorGroup group = (UMLNavigatorGroup) parentElement; return group.getChildren(); } - if(parentElement instanceof UMLNavigatorItem) { - UMLNavigatorItem navigatorItem = (UMLNavigatorItem)parentElement; - if(navigatorItem.isLeaf() || !isOwnView(navigatorItem.getView())) { + + if (parentElement instanceof UMLNavigatorItem) { + UMLNavigatorItem navigatorItem = (UMLNavigatorItem) parentElement; + if (navigatorItem.isLeaf() || !isOwnView(navigatorItem.getView())) { return EMPTY_ARRAY; } return getViewChildren(navigatorItem.getView(), parentElement); } + return EMPTY_ARRAY; } @@ -238,8 +246,8 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { */ private Object[] getViewChildren(View view, Object parentElement) { String vid = UMLVisualIDRegistry.getVisualID(view); - if(vid != null) { - switch(vid) { + if (vid != null) { + switch (vid) { } } return EMPTY_ARRAY; @@ -256,8 +264,8 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { * @generated */ public Object getParent(Object element) { - if(element instanceof UMLAbstractNavigatorItem) { - UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem)element; + if (element instanceof UMLAbstractNavigatorItem) { + UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem) element; return abstractNavigatorItem.getParent(); } return null; 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 38c78e8a6b4..27cea2fb249 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 @@ -90,9 +90,9 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem { */ @Override public boolean equals(Object obj) { - if(obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup) { - org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup)obj; - if(getGroupName().equals(anotherGroup.getGroupName())) { + if (obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup) { + org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup) obj; + if (getGroupName().equals(anotherGroup.getGroupName())) { return getParent().equals(anotherGroup.getParent()); } } 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 3610271a542..f2d3417f56c 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 @@ -27,14 +27,16 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem { */ static { @SuppressWarnings("rawtypes") - final Class[] supportedTypes = new Class[]{ View.class, EObject.class }; + final Class[] supportedTypes = new Class[] { View.class, EObject.class }; Platform.getAdapterManager().registerAdapters(new IAdapterFactory() { @Override @SuppressWarnings("rawtypes") public Object getAdapter(Object adaptableObject, Class adapterType) { - if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) { - return ((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem)adaptableObject).getView(); + if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem + && (adapterType == View.class || adapterType == EObject.class)) { + return ((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem) adaptableObject) + .getView(); } return null; } @@ -85,8 +87,9 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem { */ @Override public boolean equals(Object obj) { - if(obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem) { - return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem)obj).getView())); + if (obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem) { + return EcoreUtil.getURI(getView()).equals(EcoreUtil + .getURI(((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem) obj).getView())); } return super.equals(obj); } 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 52bb9bf558f..3a8009ad03c 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 @@ -37,8 +37,10 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL * @generated */ static { - UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?UnknownElement", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$ - UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?ImageNotFound", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?UnknownElement", //$NON-NLS-1$ + ImageDescriptor.getMissingImageDescriptor()); + UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?ImageNotFound", //$NON-NLS-1$ + ImageDescriptor.getMissingImageDescriptor()); } /** @@ -46,7 +48,7 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL */ public void updateLabel(ViewerLabel label, TreePath elementPath) { Object element = elementPath.getLastSegment(); - if(element instanceof UMLNavigatorItem && !isOwnView(((UMLNavigatorItem)element).getView())) { + if (element instanceof UMLNavigatorItem && !isOwnView(((UMLNavigatorItem) element).getView())) { return; } label.setText(getText(element)); @@ -58,17 +60,19 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL */ @Override public Image getImage(Object element) { - if(element instanceof UMLNavigatorGroup) { - UMLNavigatorGroup group = (UMLNavigatorGroup)element; + if (element instanceof UMLNavigatorGroup) { + UMLNavigatorGroup group = (UMLNavigatorGroup) element; return UMLDiagramEditorPlugin.getInstance().getBundledImage(group.getIcon()); } - if(element instanceof UMLNavigatorItem) { - UMLNavigatorItem navigatorItem = (UMLNavigatorItem)element; - if(!isOwnView(navigatorItem.getView())) { + + if (element instanceof UMLNavigatorItem) { + UMLNavigatorItem navigatorItem = (UMLNavigatorItem) element; + if (!isOwnView(navigatorItem.getView())) { return super.getImage(element); } return getImage(navigatorItem.getView()); } + return super.getImage(element); } @@ -85,11 +89,12 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL private Image getImage(String key, IElementType elementType) { ImageRegistry imageRegistry = UMLDiagramEditorPlugin.getInstance().getImageRegistry(); Image image = imageRegistry.get(key); - if(image == null && elementType != null && UMLElementTypes.isKnownElementType(elementType)) { + if (image == null && elementType != null && UMLElementTypes.isKnownElementType(elementType)) { image = UMLElementTypes.getImage(elementType); imageRegistry.put(key, image); } - if(image == null) { + + if (image == null) { image = imageRegistry.get("Navigator?ImageNotFound"); //$NON-NLS-1$ imageRegistry.put(key, image); } @@ -101,17 +106,19 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL */ @Override public String getText(Object element) { - if(element instanceof UMLNavigatorGroup) { - UMLNavigatorGroup group = (UMLNavigatorGroup)element; + if (element instanceof UMLNavigatorGroup) { + UMLNavigatorGroup group = (UMLNavigatorGroup) element; return group.getGroupName(); } - if(element instanceof UMLNavigatorItem) { - UMLNavigatorItem navigatorItem = (UMLNavigatorItem)element; - if(!isOwnView(navigatorItem.getView())) { + + if (element instanceof UMLNavigatorItem) { + UMLNavigatorItem navigatorItem = (UMLNavigatorItem) element; + if (!isOwnView(navigatorItem.getView())) { return null; } return getText(navigatorItem.getView()); } + return super.getText(element); } @@ -119,7 +126,7 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL * @generated */ public String getText(View view) { - if(view.getElement() != null && view.getElement().eIsProxy()) { + if (view.getElement() != null && view.getElement().eIsProxy()) { return getUnresolvedDomainElementProxyText(view); } return getUnknownElementText(view); 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 10f763b0607..6513e9465ba 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 @@ -41,11 +41,11 @@ public class UMLNavigatorLinkHelper implements ILinkHelper { */ private static IEditorInput getEditorInput(Diagram diagram) { Resource diagramResource = diagram.eResource(); - for(EObject nextEObject : diagramResource.getContents()) { - if(nextEObject == diagram) { + for (EObject nextEObject : diagramResource.getContents()) { + if (nextEObject == diagram) { return new FileEditorInput(WorkspaceSynchronizer.getFile(diagramResource)); } - if(nextEObject instanceof Diagram) { + if (nextEObject instanceof Diagram) { break; } } @@ -66,41 +66,42 @@ public class UMLNavigatorLinkHelper implements ILinkHelper { * @generated */ public void activateEditor(IWorkbenchPage aPage, IStructuredSelection aSelection) { - if(aSelection == null || aSelection.isEmpty()) { + if (aSelection == null || aSelection.isEmpty()) { return; } - if(false == aSelection.getFirstElement() instanceof UMLAbstractNavigatorItem) { + if (false == aSelection.getFirstElement() instanceof UMLAbstractNavigatorItem) { return; } - UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem)aSelection.getFirstElement(); + + UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem) aSelection.getFirstElement(); View navigatorView = null; - if(abstractNavigatorItem instanceof UMLNavigatorItem) { - navigatorView = ((UMLNavigatorItem)abstractNavigatorItem).getView(); - } else if(abstractNavigatorItem instanceof UMLNavigatorGroup) { - UMLNavigatorGroup navigatorGroup = (UMLNavigatorGroup)abstractNavigatorItem; - if(navigatorGroup.getParent() instanceof UMLNavigatorItem) { - navigatorView = ((UMLNavigatorItem)navigatorGroup.getParent()).getView(); + if (abstractNavigatorItem instanceof UMLNavigatorItem) { + navigatorView = ((UMLNavigatorItem) abstractNavigatorItem).getView(); + } else if (abstractNavigatorItem instanceof UMLNavigatorGroup) { + UMLNavigatorGroup navigatorGroup = (UMLNavigatorGroup) abstractNavigatorItem; + if (navigatorGroup.getParent() instanceof UMLNavigatorItem) { + navigatorView = ((UMLNavigatorItem) navigatorGroup.getParent()).getView(); } } - if(navigatorView == null) { + if (navigatorView == null) { return; } IEditorInput editorInput = getEditorInput(navigatorView.getDiagram()); IEditorPart editor = aPage.findEditor(editorInput); - if(editor == null) { + if (editor == null) { return; } aPage.bringToTop(editor); - if(editor instanceof DiagramEditor) { - DiagramEditor diagramEditor = (DiagramEditor)editor; + if (editor instanceof DiagramEditor) { + DiagramEditor diagramEditor = (DiagramEditor) editor; ResourceSet diagramEditorResourceSet = diagramEditor.getEditingDomain().getResourceSet(); EObject selectedView = diagramEditorResourceSet.getEObject(EcoreUtil.getURI(navigatorView), true); - if(selectedView == null) { + if (selectedView == null) { return; } - GraphicalViewer graphicalViewer = (GraphicalViewer)diagramEditor.getAdapter(GraphicalViewer.class); - EditPart selectedEditPart = (EditPart)graphicalViewer.getEditPartRegistry().get(selectedView); - if(selectedEditPart != null) { + GraphicalViewer graphicalViewer = (GraphicalViewer) diagramEditor.getAdapter(GraphicalViewer.class); + EditPart selectedEditPart = (EditPart) graphicalViewer.getEditPartRegistry().get(selectedView); + if (selectedEditPart != null) { graphicalViewer.select(selectedEditPart); } } 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 b0eceb43bce..1a3d76583ba 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 @@ -29,8 +29,8 @@ public class UMLNavigatorSorter extends ViewerSorter { */ @Override public int category(Object element) { - if(element instanceof UMLNavigatorItem) { - UMLNavigatorItem item = (UMLNavigatorItem)element; + if (element instanceof UMLNavigatorItem) { + UMLNavigatorItem item = (UMLNavigatorItem) element; return UMLVisualIDRegistry.getVisualID(item.getView()).hashCode(); } return GROUP_CATEGORY; 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 ffa85b45667..0bc3cd67b32 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 @@ -74,10 +74,10 @@ public class MessageFormatParser extends AbstractAttributeParser { * @generated */ protected String getDefaultPattern() { - if(defaultPattern == null) { + if (defaultPattern == null) { StringBuffer sb = new StringBuffer(); - for(int i = 0; i < features.length; i++) { - if(i > 0) { + for (int i = 0; i < features.length; i++) { + if (i > 0) { sb.append(' '); } sb.append('{'); @@ -111,7 +111,7 @@ public class MessageFormatParser extends AbstractAttributeParser { * @generated */ protected MessageFormat getViewProcessor() { - if(viewProcessor == null) { + if (viewProcessor == null) { viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern()); } return viewProcessor; @@ -121,8 +121,9 @@ public class MessageFormatParser extends AbstractAttributeParser { * @generated */ protected MessageFormat getEditorProcessor() { - if(editorProcessor == null) { - editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern()); + if (editorProcessor == null) { + editorProcessor = new MessageFormat( + getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern()); } return editorProcessor; } @@ -131,10 +132,10 @@ public class MessageFormatParser extends AbstractAttributeParser { * @generated */ protected String getDefaultEditablePattern() { - if(defaultEditablePattern == null) { + if (defaultEditablePattern == null) { StringBuffer sb = new StringBuffer(); - for(int i = 0; i < editableFeatures.length; i++) { - if(i > 0) { + for (int i = 0; i < editableFeatures.length; i++) { + if (i > 0) { sb.append(' '); } sb.append('{'); @@ -159,8 +160,9 @@ public class MessageFormatParser extends AbstractAttributeParser { * @generated */ protected MessageFormat getEditProcessor() { - if(editProcessor == null) { - editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern()); + if (editProcessor == null) { + editProcessor = new MessageFormat( + getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern()); } return editProcessor; } @@ -169,8 +171,9 @@ public class MessageFormatParser extends AbstractAttributeParser { * @generated */ public String getEditString(IAdaptable adapter, int flags) { - EObject element = (EObject)adapter.getAdapter(EObject.class); - return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString(); + EObject element = (EObject) adapter.getAdapter(EObject.class); + return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)) + .toString(); } /** @@ -179,8 +182,9 @@ public class MessageFormatParser extends AbstractAttributeParser { public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) { ParsePosition pos = new ParsePosition(0); Object[] values = getEditProcessor().parse(editString, pos); - if(values == null) { - return new ParserEditStatus(UMLDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex()))); + if (values == null) { + return new ParserEditStatus(UMLDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, + NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex()))); } return validateNewValues(values); } @@ -197,7 +201,7 @@ public class MessageFormatParser extends AbstractAttributeParser { * @generated */ public String getPrintString(IAdaptable adapter, int flags) { - EObject element = (EObject)adapter.getAdapter(EObject.class); + EObject element = (EObject) adapter.getAdapter(EObject.class); return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString(); } } 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 8ae0c088575..10afae02a66 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 @@ -45,14 +45,16 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider public void buildContextMenu(final IMenuManager menu) { getViewer().flush(); try { - TransactionUtil.getEditingDomain((EObject)getViewer().getContents().getModel()).runExclusive(new Runnable() { + TransactionUtil.getEditingDomain((EObject) getViewer().getContents().getModel()) + .runExclusive(new Runnable() { - @Override - public void run() { - ContributionItemService.getInstance().contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part); - menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL); - } - }); + @Override + public void run() { + ContributionItemService.getInstance() + .contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part); + menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL); + } + }); } catch (Exception e) { UMLDiagramEditorPlugin.getInstance().logError("Error building context menu", e); } 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 d295af78642..bb054642c58 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 @@ -102,7 +102,8 @@ public class UMLCreationWizard extends Wizard implements INewWizard { this.workbench = workbench; this.selection = selection; setWindowTitle(Messages.UMLCreationWizardTitle); - setDefaultPageImageDescriptor(UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$ + setDefaultPageImageDescriptor( + UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$ setNeedsProgressMonitor(true); } @@ -111,18 +112,21 @@ public class UMLCreationWizard extends Wizard implements INewWizard { */ @Override public void addPages() { - diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "PapyrusUMLProfile_diagram"); //$NON-NLS-1$ //$NON-NLS-2$ + diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), //$NON-NLS-1$ + "PapyrusUMLProfile_diagram"); //$NON-NLS-1$ diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle); diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription); addPage(diagramModelFilePage); + domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "PapyrusUMLProfile") { //$NON-NLS-1$ //$NON-NLS-2$ @Override public void setVisible(boolean visible) { - if(visible) { + if (visible) { String fileName = diagramModelFilePage.getFileName(); fileName = fileName.substring(0, fileName.length() - ".PapyrusUMLProfile_diagram".length()); //$NON-NLS-1$ - setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName, "PapyrusUMLProfile")); //$NON-NLS-1$ + setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName, + "PapyrusUMLProfile")); //$NON-NLS-1$ } super.setVisible(visible); } @@ -141,12 +145,14 @@ public class UMLCreationWizard extends Wizard implements INewWizard { @Override protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException { - diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(), monitor); - if(isOpenNewlyCreatedDiagramEditor() && diagram != null) { + diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), + domainModelFilePage.getURI(), monitor); + if (isOpenNewlyCreatedDiagramEditor() && diagram != null) { try { UMLDiagramEditorUtil.openDiagram(diagram); } catch (PartInitException e) { - ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError, null, e.getStatus()); + ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError, + null, e.getStatus()); } } } @@ -156,8 +162,9 @@ public class UMLCreationWizard extends Wizard implements INewWizard { } catch (InterruptedException e) { return false; } catch (InvocationTargetException e) { - if(e.getTargetException() instanceof CoreException) { - ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null, ((CoreException)e.getTargetException()).getStatus()); + if (e.getTargetException() instanceof CoreException) { + ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null, + ((CoreException) e.getTargetException()).getStatus()); } else { UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$ } 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 5ca9025d5da..381d1a6d37a 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 @@ -58,11 +58,11 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage { */ protected IPath getFilePath() { IPath path = getContainerFullPath(); - if(path == null) { + if (path == null) { path = new Path(""); //$NON-NLS-1$ } String fileName = getFileName(); - if(fileName != null) { + if (fileName != null) { path = path.append(fileName); } return path; @@ -83,11 +83,11 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage { */ @Override protected boolean validatePage() { - if(!super.validatePage()) { + if (!super.validatePage()) { return false; } String extension = getExtension(); - if(extension != null && !getFilePath().toString().endsWith("." + extension)) { + if (extension != null && !getFilePath().toString().endsWith("." + extension)) { setErrorMessage(NLS.bind(Messages.UMLCreationWizardPageExtensionError, extension)); return false; } 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 02cd1545cca..25872d79a69 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 @@ -52,7 +52,7 @@ public class UMLDiagramActionBarContributor extends DiagramActionBarContributor fileMenu.remove("pageSetupAction"); //$NON-NLS-1$ IMenuManager editMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_EDIT); assert editMenu != null; - if(editMenu.find("validationGroup") == null) { //$NON-NLS-1$ + if (editMenu.find("validationGroup") == null) { //$NON-NLS-1$ editMenu.add(new GroupMarker("validationGroup")); //$NON-NLS-1$ } IAction validateAction = new ValidateAction(page); 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 891693fc293..03ccadc2fe8 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 @@ -104,489 +104,529 @@ public class UMLDiagramContentInitializer { * @generated */ public void initDiagramContent(Diagram diagram) { - if(!ProfileDiagramEditPart.MODEL_ID.equals(diagram.getType())) { - UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram passed as a parameter: " + diagram.getType()); + if (!ProfileDiagramEditPart.MODEL_ID.equals(diagram.getType())) { + UMLDiagramEditorPlugin.getInstance() + .logError("Incorrect diagram passed as a parameter: " + diagram.getType()); return; } - if(false == diagram.getElement() instanceof Profile) { - UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram element specified: " + diagram.getElement() + " instead of Profile"); + if (false == diagram.getElement() instanceof Profile) { + UMLDiagramEditorPlugin.getInstance() + .logError("Incorrect diagram element specified: " + diagram.getElement() + " instead of Profile"); return; } - createProfile_1000Children(diagram); + createProfile_ProfileDiagram_Children(diagram); createLinks(diagram); } /** - * @generated - */ - private void createProfile_1000Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProfile_1000SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + * @generated + */ + private void createProfile_ProfileDiagram_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProfile_ProfileDiagram_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createDependency_2014Children(View view) { + private void createDependency_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_2014OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_Shape_OutgoingLinks(view)); } /** * @generated */ - private void createAssociation_2015Children(View view) { + private void createAssociation_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAssociation_2015OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAssociation_Shape_OutgoingLinks(view)); } /** * @generated */ - private void createStereotype_1026Children(View view) { + private void createStereotype_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStereotype_1026OutgoingLinks(view)); - createStereotypeAttributes_1071Children(getCompartment(view, StereotypeAttributeCompartmentEditPart.VISUAL_ID)); - createStereotypeOperations_1019Children(getCompartment(view, StereotypeOperationCompartmentEditPart.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStereotype_Shape_OutgoingLinks(view)); + createStereotype_AttributeCompartment_Children( + getCompartment(view, StereotypeAttributeCompartmentEditPart.VISUAL_ID)); + createStereotype_OperationCompartment_Children( + getCompartment(view, StereotypeOperationCompartmentEditPart.VISUAL_ID)); } /** * @generated */ - private void createClass_2008Children(View view) { + private void createClass_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_2008OutgoingLinks(view)); - createClassOperations_7018Children(getCompartment(view, ClassOperationCompartmentEditPart.VISUAL_ID)); - createClassAttributes_7017Children(getCompartment(view, ClassAttributeCompartmentEditPart.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_Shape_OutgoingLinks(view)); + createClass_OperationCompartment_Children(getCompartment(view, ClassOperationCompartmentEditPart.VISUAL_ID)); + createClass_AttributeCompartment_Children(getCompartment(view, ClassAttributeCompartmentEditPart.VISUAL_ID)); } /** * @generated */ - private void createClass_1031Children(View view) { + private void createClass_MetaclassShape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_1031OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_MetaclassShape_OutgoingLinks(view)); } /** * @generated */ - private void createComment_1002Children(View view) { + private void createComment_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_1002OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_Shape_OutgoingLinks(view)); } /** - * @generated - */ - private void createConstraint_1014Children(View view) { + * @generated + */ + private void createConstraint_PackagedElementShape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_1014OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_PackagedElementShape_OutgoingLinks(view)); } /** * @generated */ - private void createModel_2005Children(View view) { + private void createModel_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getModel_2005OutgoingLinks(view)); - createModelPackagedelements_1057Children(getCompartment(view, ModelPackageableElementCompartmentEditPartTN.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getModel_Shape_OutgoingLinks(view)); + createModel_PackagedElementCompartment_Children( + getCompartment(view, ModelPackageableElementCompartmentEditPartTN.VISUAL_ID)); } /** * @generated */ - private void createProfile_1030Children(View view) { + private void createProfile_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProfile_1030OutgoingLinks(view)); - createProfilePackagedelements_1042Children(getCompartment(view, ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProfile_Shape_OutgoingLinks(view)); + createProfile_PackagedElementCompartment_Children( + getCompartment(view, ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID)); } /** * @generated */ - private void createPackage_2007Children(View view) { + private void createPackage_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPackage_2007OutgoingLinks(view)); - createPackagePackagedelements_1005Children(getCompartment(view, PackagePackageableElementCompartmentEditPart.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPackage_Shape_OutgoingLinks(view)); + createPackage_PackagedElementCompartment_Children( + getCompartment(view, PackagePackageableElementCompartmentEditPart.VISUAL_ID)); } /** * @generated */ - private void createEnumeration_2006Children(View view) { + private void createEnumeration_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_2006OutgoingLinks(view)); - createEnumerationLiterals_1063Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_Shape_OutgoingLinks(view)); + createEnumeration_LiteralCompartment_Children( + getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID)); } /** * @generated */ - private void createPrimitiveType_2009Children(View view) { + private void createPrimitiveType_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_2009OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_Shape_OutgoingLinks(view)); } /** * @generated */ - private void createDataType_2010Children(View view) { + private void createDataType_Shape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_2010OutgoingLinks(view)); - createDataTypeAttributes_1067Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID)); - createDataTypeOperations_1068Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_Shape_OutgoingLinks(view)); + createDataType_AttributeCompartment_Children( + getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID)); + createDataType_OperationCompartment_Children( + getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID)); } /** * @generated */ - private void createDiagram_2016Children(View view) { + private void createDiagram_ShortcutShape_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDiagram_2016OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDiagram_ShortcutShape_OutgoingLinks(view)); } /** * @generated */ - private void createPrimitiveType_3026Children(View view) { + private void createPrimitiveType_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_3026OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_Shape_CN_OutgoingLinks(view)); } /** * @generated */ - private void createOperation_3019Children(View view) { + private void createOperation_DataTypeOperationLabel_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_3019OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_DataTypeOperationLabel_OutgoingLinks(view)); } /** * @generated */ - private void createEnumerationLiteral_1037Children(View view) { + private void createEnumerationLiteral_LiteralLabel_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumerationLiteral_1037OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumerationLiteral_LiteralLabel_OutgoingLinks(view)); } /** * @generated */ - private void createProperty_3018Children(View view) { + private void createProperty_DataTypeAttributeLabel_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3018OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_DataTypeAttributeLabel_OutgoingLinks(view)); } /** * @generated */ - private void createProperty_3002Children(View view) { + private void createProperty_ClassAttributeLabel_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3002OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_ClassAttributeLabel_OutgoingLinks(view)); } /** * @generated */ - private void createOperation_3020Children(View view) { + private void createOperation_ClassOperationLabel_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_3020OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_ClassOperationLabel_OutgoingLinks(view)); } /** * @generated */ - private void createStereotype_1023Children(View view) { + private void createStereotype_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStereotype_1023OutgoingLinks(view)); - createStereotypeAttributes_1052Children(getCompartment(view, StereotypeAttributeCompartmentEditPartCN.VISUAL_ID)); - createStereotypeOperations_1053Children(getCompartment(view, StereotypeOperationCompartmentEditPartCN.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStereotype_Shape_CN_OutgoingLinks(view)); + createStereotype_AttributeCompartment_CN_Children( + getCompartment(view, StereotypeAttributeCompartmentEditPartCN.VISUAL_ID)); + createStereotype_OperationCompartment_CN_Children( + getCompartment(view, StereotypeOperationCompartmentEditPartCN.VISUAL_ID)); } /** * @generated */ - private void createClass_3010Children(View view) { + private void createClass_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_3010OutgoingLinks(view)); - createClassAttributes_7011Children(getCompartment(view, ClassAttributeCompartmentEditPartCN.VISUAL_ID)); - createClassOperations_7012Children(getCompartment(view, ClassOperationCompartmentEditPartCN.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_Shape_CN_OutgoingLinks(view)); + createClass_AttributeCompartment_CN_Children( + getCompartment(view, ClassAttributeCompartmentEditPartCN.VISUAL_ID)); + createClass_OperationCompartment_CN_Children( + getCompartment(view, ClassOperationCompartmentEditPartCN.VISUAL_ID)); } /** * @generated */ - private void createClass_3028Children(View view) { + private void createClass_MetaclassShape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_3028OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_MetaclassShape_CN_OutgoingLinks(view)); } /** * @generated */ - private void createComment_1007Children(View view) { + private void createComment_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_1007OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_Shape_CN_OutgoingLinks(view)); } /** * @generated */ - private void createModel_1027Children(View view) { + private void createModel_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getModel_1027OutgoingLinks(view)); - createModelPackagedelements_1058Children(getCompartment(view, ModelPackageableElementCompartmentEditPartCN.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getModel_Shape_CN_OutgoingLinks(view)); + createModel_PackagedElementCompartment_CN_Children( + getCompartment(view, ModelPackageableElementCompartmentEditPartCN.VISUAL_ID)); } /** * @generated */ - private void createProfile_1024Children(View view) { + private void createProfile_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProfile_1024OutgoingLinks(view)); - createProfilePackagedelements_1051Children(getCompartment(view, ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProfile_Shape_CN_OutgoingLinks(view)); + createProfile_PackagedElementCompartment_CN_Children( + getCompartment(view, ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID)); } /** * @generated */ - private void createPackage_1012Children(View view) { + private void createPackage_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), 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()); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPackage_Shape_CN_OutgoingLinks(view)); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackage_Shape_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } - createPackagePackagedelements_11Children(getCompartment(view, PackagePackageableElementCompartmentEditPartCN.VISUAL_ID)); + createPackage_PackagedElementCompartment_CN_Children( + getCompartment(view, PackagePackageableElementCompartmentEditPartCN.VISUAL_ID)); } /** - * @generated - */ - private void createConstraint_1028Children(View view) { + * @generated + */ + private void createConstraint_PackagedElementShape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_1028OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_PackagedElementShape_CN_OutgoingLinks(view)); } /** * @generated */ - private void createEnumeration_3025Children(View view) { + private void createEnumeration_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_3025OutgoingLinks(view)); - createEnumerationLiterals_1062Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_Shape_CN_OutgoingLinks(view)); + createEnumeration_LiteralCompartment_CN_Children( + getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID)); } /** * @generated */ - private void createDataType_3027Children(View view) { + private void createDataType_Shape_CN_Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_3027OutgoingLinks(view)); - createDataTypeAttributes_1069Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID)); - createDataTypeOperations_1070Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_Shape_CN_OutgoingLinks(view)); + createDataType_AttributeCompartment_CN_Children( + getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID)); + createDataType_OperationCompartment_CN_Children( + getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID)); } /** * @generated */ - private void createPackagePackagedelements_1005Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackagePackagedelements_1005SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createPackage_PackagedElementCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getPackage_PackagedElementCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createPackagePackagedelements_11Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackagePackagedelements_11SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createPackage_PackagedElementCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getPackage_PackagedElementCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createProfilePackagedelements_1042Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProfilePackagedelements_1042SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createProfile_PackagedElementCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getProfile_PackagedElementCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createProfilePackagedelements_1051Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProfilePackagedelements_1051SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createProfile_PackagedElementCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getProfile_PackagedElementCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createStereotypeAttributes_1071Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStereotypeAttributes_1071SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createStereotype_AttributeCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getStereotype_AttributeCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createStereotypeAttributes_1052Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStereotypeAttributes_1052SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createStereotype_AttributeCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getStereotype_AttributeCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createStereotypeOperations_1019Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStereotypeOperations_1019SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createStereotype_OperationCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getStereotype_OperationCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createStereotypeOperations_1053Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStereotypeOperations_1053SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createStereotype_OperationCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getStereotype_OperationCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createModelPackagedelements_1057Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getModelPackagedelements_1057SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createModel_PackagedElementCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getModel_PackagedElementCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createModelPackagedelements_1058Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getModelPackagedelements_1058SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createModel_PackagedElementCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getModel_PackagedElementCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createEnumerationLiterals_1062Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_1062SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createEnumeration_LiteralCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getEnumeration_LiteralCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createEnumerationLiterals_1063Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_1063SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createEnumeration_LiteralCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getEnumeration_LiteralCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createDataTypeAttributes_1067Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_1067SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createDataType_AttributeCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getDataType_AttributeCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createDataTypeAttributes_1069Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_1069SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createDataType_AttributeCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getDataType_AttributeCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createDataTypeOperations_1068Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_1068SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createDataType_OperationCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getDataType_OperationCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createDataTypeOperations_1070Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_1070SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createDataType_OperationCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getDataType_OperationCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createClassAttributes_7017Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassAttributes_7017SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createClass_AttributeCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getClass_AttributeCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createClassAttributes_7011Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassAttributes_7011SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createClass_AttributeCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getClass_AttributeCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createClassOperations_7018Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassOperations_7018SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createClass_OperationCompartment_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getClass_OperationCompartment_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } /** * @generated */ - private void createClassOperations_7012Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassOperations_7012SemanticChildren(view); - for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { - createNode(view, (UMLNodeDescriptor)it.next()); + private void createClass_OperationCompartment_CN_Children(View view) { + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE + .getClass_OperationCompartment_CN_SemanticChildren(view); + for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { + createNode(view, (UMLNodeDescriptor) it.next()); } } @@ -595,97 +635,98 @@ public class UMLDiagramContentInitializer { */ private void createNode(View parentView, UMLNodeDescriptor nodeDescriptor) { final String nodeType = UMLVisualIDRegistry.getType(nodeDescriptor.getVisualID()); - Node node = ViewService.createNode(parentView, nodeDescriptor.getModelElement(), nodeType, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); - switch(nodeDescriptor.getVisualID()) { + Node node = ViewService.createNode(parentView, nodeDescriptor.getModelElement(), nodeType, + UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); + switch (nodeDescriptor.getVisualID()) { case DependencyNodeEditPart.VISUAL_ID: - createDependency_2014Children(node); + createDependency_Shape_Children(node); return; case AssociationNodeEditPart.VISUAL_ID: - createAssociation_2015Children(node); + createAssociation_Shape_Children(node); return; case StereotypeEditPart.VISUAL_ID: - createStereotype_1026Children(node); + createStereotype_Shape_Children(node); return; case ClassEditPart.VISUAL_ID: - createClass_2008Children(node); + createClass_Shape_Children(node); return; case MetaclassEditPart.VISUAL_ID: - createClass_1031Children(node); + createClass_MetaclassShape_Children(node); return; case CommentEditPart.VISUAL_ID: - createComment_1002Children(node); + createComment_Shape_Children(node); return; case ConstraintEditPart.VISUAL_ID: - createConstraint_1014Children(node); + createConstraint_PackagedElementShape_Children(node); return; case ModelEditPartTN.VISUAL_ID: - createModel_2005Children(node); + createModel_Shape_Children(node); return; case ProfileEditPartTN.VISUAL_ID: - createProfile_1030Children(node); + createProfile_Shape_Children(node); return; case PackageEditPart.VISUAL_ID: - createPackage_2007Children(node); + createPackage_Shape_Children(node); return; case EnumerationEditPart.VISUAL_ID: - createEnumeration_2006Children(node); + createEnumeration_Shape_Children(node); return; case PrimitiveTypeEditPart.VISUAL_ID: - createPrimitiveType_2009Children(node); + createPrimitiveType_Shape_Children(node); return; case DataTypeEditPart.VISUAL_ID: - createDataType_2010Children(node); + createDataType_Shape_Children(node); return; case ShortCutDiagramEditPart.VISUAL_ID: - createDiagram_2016Children(node); + createDiagram_ShortcutShape_Children(node); return; case PrimitiveTypeEditPartCN.VISUAL_ID: - createPrimitiveType_3026Children(node); + createPrimitiveType_Shape_CN_Children(node); return; case DataTypeOperationEditPart.VISUAL_ID: - createOperation_3019Children(node); + createOperation_DataTypeOperationLabel_Children(node); return; case EnumerationLiteralEditPart.VISUAL_ID: - createEnumerationLiteral_1037Children(node); + createEnumerationLiteral_LiteralLabel_Children(node); return; case DataTypePropertyEditPart.VISUAL_ID: - createProperty_3018Children(node); + createProperty_DataTypeAttributeLabel_Children(node); return; case ClassPropertyEditPart.VISUAL_ID: - createProperty_3002Children(node); + createProperty_ClassAttributeLabel_Children(node); return; case ClassOperationEditPart.VISUAL_ID: - createOperation_3020Children(node); + createOperation_ClassOperationLabel_Children(node); return; case StereotypeEditPartCN.VISUAL_ID: - createStereotype_1023Children(node); + createStereotype_Shape_CN_Children(node); return; case ClassEditPartCN.VISUAL_ID: - createClass_3010Children(node); + createClass_Shape_CN_Children(node); return; case MetaclassEditPartCN.VISUAL_ID: - createClass_3028Children(node); + createClass_MetaclassShape_CN_Children(node); return; case CommentEditPartCN.VISUAL_ID: - createComment_1007Children(node); + createComment_Shape_CN_Children(node); return; case ModelEditPartCN.VISUAL_ID: - createModel_1027Children(node); + createModel_Shape_CN_Children(node); return; case ProfileEditPartCN.VISUAL_ID: - createProfile_1024Children(node); + createProfile_Shape_CN_Children(node); return; case PackageEditPartCN.VISUAL_ID: - createPackage_1012Children(node); + createPackage_Shape_CN_Children(node); return; case ConstraintEditPartCN.VISUAL_ID: - createConstraint_1028Children(node); + createConstraint_PackagedElementShape_CN_Children(node); return; case EnumerationEditPartCN.VISUAL_ID: - createEnumeration_3025Children(node); + createEnumeration_Shape_CN_Children(node); return; case DataTypeEditPartCN.VISUAL_ID: - createDataType_3027Children(node); + createDataType_Shape_CN_Children(node); return; } } @@ -694,51 +735,60 @@ public class UMLDiagramContentInitializer { * @generated */ private void createLinks(Diagram diagram) { - for(boolean continueLinkCreation = true; continueLinkCreation;) { + for (boolean continueLinkCreation = true; continueLinkCreation;) { continueLinkCreation = false; Collection additionalDescriptors = new LinkedList(); - for(Iterator it = myLinkDescriptors.iterator(); it.hasNext();) { - UMLLinkDescriptor nextLinkDescriptor = (UMLLinkDescriptor)it.next(); - if(!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource()) || !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) { + for (Iterator it = myLinkDescriptors.iterator(); it.hasNext();) { + UMLLinkDescriptor nextLinkDescriptor = (UMLLinkDescriptor) it.next(); + if (!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource()) + || !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) { continue; } final String linkType = UMLVisualIDRegistry.getType(nextLinkDescriptor.getVisualID()); - Edge edge = ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, linkType, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); - if(edge != null) { - edge.setSource((View)myDomain2NotationMap.get(nextLinkDescriptor.getSource())); - edge.setTarget((View)myDomain2NotationMap.get(nextLinkDescriptor.getDestination())); + Edge edge = ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, + linkType, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); + if (edge != null) { + edge.setSource((View) myDomain2NotationMap.get(nextLinkDescriptor.getSource())); + edge.setTarget((View) myDomain2NotationMap.get(nextLinkDescriptor.getDestination())); it.remove(); - if(nextLinkDescriptor.getModelElement() != null) { + if (nextLinkDescriptor.getModelElement() != null) { myDomain2NotationMap.put(nextLinkDescriptor.getModelElement(), edge); } continueLinkCreation = true; - switch(nextLinkDescriptor.getVisualID()) { + switch (nextLinkDescriptor.getVisualID()) { case ExtensionEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExtension_1013OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExtension_Edge_OutgoingLinks(edge)); break; case AssociationEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAssociation_4001OutgoingLinks(edge)); + additionalDescriptors + .addAll(UMLDiagramUpdater.INSTANCE.getAssociation_Edge_OutgoingLinks(edge)); break; case ProfileApplicationEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProfileApplication_1045OutgoingLinks(edge)); + additionalDescriptors + .addAll(UMLDiagramUpdater.INSTANCE.getProfileApplication_Edge_OutgoingLinks(edge)); break; case AssociationBranchEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAssociation_4019OutgoingLinks(edge)); + additionalDescriptors + .addAll(UMLDiagramUpdater.INSTANCE.getAssociation_BranchEdge_OutgoingLinks(edge)); break; case GeneralizationEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getGeneralization_4002OutgoingLinks(edge)); + additionalDescriptors + .addAll(UMLDiagramUpdater.INSTANCE.getGeneralization_Edge_OutgoingLinks(edge)); break; case DependencyEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4008OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_Edge_OutgoingLinks(edge)); break; case DependencyBranchEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4018OutgoingLinks(edge)); + additionalDescriptors + .addAll(UMLDiagramUpdater.INSTANCE.getDependency_BranchEdge_OutgoingLinks(edge)); break; case ElementImportEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getElementImport_1064OutgoingLinks(edge)); + additionalDescriptors + .addAll(UMLDiagramUpdater.INSTANCE.getElementImport_Edge_OutgoingLinks(edge)); break; case PackageImportEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPackageImport_1065OutgoingLinks(edge)); + additionalDescriptors + .addAll(UMLDiagramUpdater.INSTANCE.getPackageImport_Edge_OutgoingLinks(edge)); break; } } @@ -752,10 +802,10 @@ public class UMLDiagramContentInitializer { */ private Node getCompartment(View node, String visualID) { String type = UMLVisualIDRegistry.getType(visualID); - for(Iterator it = node.getChildren().iterator(); it.hasNext();) { - View nextView = (View)it.next(); - if(nextView instanceof Node && type.equals(nextView.getType())) { - return (Node)nextView; + for (Iterator it = node.getChildren().iterator(); it.hasNext();) { + View nextView = (View) it.next(); + if (nextView instanceof Node && type.equals(nextView.getType())) { + return (Node) nextView; } } return null; 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 548e6c8a8a0..2fa85c230ec 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 @@ -105,13 +105,17 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh */ public UMLDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException { super(servicesRegistry, diagram); + // adds a listener to the palette service, which reacts to palette customizations PapyrusPaletteService.getInstance().addProviderChangeListener(this); + // Share the same editing provider editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class); documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain); + // overrides editing domain created by super constructor setDocumentProvider(documentProvider); + } /** @@ -128,7 +132,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh @Override protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) { PaletteRoot paletteRoot; - if(existingPaletteRoot == null) { + if (existingPaletteRoot == null) { paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent()); } else { PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent()); @@ -160,12 +164,12 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class type) { - if(type == IShowInTargetList.class) { + if (type == IShowInTargetList.class) { return new IShowInTargetList() { @Override public String[] getShowInTargetIds() { - return new String[]{ ProjectExplorer.VIEW_ID }; + return new String[] { ProjectExplorer.VIEW_ID }; } }; } @@ -248,7 +252,8 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh @Override protected void configureGraphicalViewer() { super.configureGraphicalViewer(); - DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer()); + DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, + getDiagramGraphicalViewer()); getDiagramGraphicalViewer().setContextMenu(provider); getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer()); } @@ -290,7 +295,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh * @generated */ protected OperationHistoryDirtyState getDirtyState() { - if(dirtyState == null) { + if (dirtyState == null) { dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory()); } return dirtyState; @@ -301,10 +306,11 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh */ @Override protected void setUndoContext(IUndoContext context) { - if(dirtyState != null) { + if (dirtyState != null) { dirtyState.dispose(); dirtyState = null; } + super.setUndoContext(context); } @@ -321,8 +327,9 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh */ public void providerChanged(ProviderChangeEvent event) { // update the palette if the palette service has changed - if(PapyrusPaletteService.getInstance().equals(event.getSource())) { - PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent()); + if (PapyrusPaletteService.getInstance().equals(event.getSource())) { + PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, + getDefaultPaletteContent()); } } @@ -334,10 +341,12 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh // remove palette service listener // remove preference listener PapyrusPaletteService.getInstance().removeProviderChangeListener(this); - if(dirtyState != null) { + + if (dirtyState != null) { dirtyState.dispose(); dirtyState = null; } + super.dispose(); } @@ -374,10 +383,13 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh @Override protected void configurePaletteViewer(PaletteViewer viewer) { super.configurePaletteViewer(viewer); + // customize menu... viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer)); + viewer.getKeyHandler().setParent(getPaletteKeyHandler()); viewer.getControl().addMouseListener(getPaletteMouseListener()); + // Add a transfer drag target listener that is supported on // palette template entries whose template is a creation tool. // This will enable drag and drop of the palette shape creation @@ -399,7 +411,9 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh * @return Palette Key Handler for the palette */ private KeyHandler getPaletteKeyHandler() { - if(paletteKeyHandler == null) { + + if (paletteKeyHandler == null) { + paletteKeyHandler = new KeyHandler() { /** @@ -414,18 +428,27 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh */ @Override public boolean keyReleased(KeyEvent event) { - if(event.keyCode == SWT.Selection) { + + if (event.keyCode == SWT.Selection) { + Tool tool = getPaletteViewer().getActiveTool().createTool(); - if(toolSupportsAccessibility(tool)) { + + if (toolSupportsAccessibility(tool)) { + tool.keyUp(event, getDiagramGraphicalViewer()); + // deactivate current selection getPaletteViewer().setActiveTool(null); + return true; } + } return super.keyReleased(event); } + }; + } return paletteKeyHandler; } @@ -434,7 +457,9 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh * @return Palette Mouse listener for the palette */ private MouseListener getPaletteMouseListener() { - if(paletteMouseListener == null) { + + if (paletteMouseListener == null) { + paletteMouseListener = new MouseListener() { /** @@ -452,10 +477,13 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh @Override public void mouseDoubleClick(MouseEvent e) { Tool tool = getPaletteViewer().getActiveTool().createTool(); - if(toolSupportsAccessibility(tool)) { + + if (toolSupportsAccessibility(tool)) { + tool.setViewer(getDiagramGraphicalViewer()); tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain()); tool.mouseDoubleClick(e, getDiagramGraphicalViewer()); + // Current active tool should be deactivated, // but if it is down here it will get // reactivated deep in GEF palette code after @@ -473,15 +501,18 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh public void mouseUp(MouseEvent e) { // Deactivate current active tool here if a // double-click was handled. - if(clearActiveTool) { + if (clearActiveTool) { getPaletteViewer().setActiveTool(null); clearActiveTool = false; } + } }; + } return paletteMouseListener; } + }; } @@ -499,20 +530,23 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh @Override protected void initializeGraphicalViewer() { super.initializeGraphicalViewer(); + // Enable Drop - getDiagramGraphicalViewer().addDropTargetListener(new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) { + getDiagramGraphicalViewer().addDropTargetListener( + new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) { - @Override - protected Object getJavaObject(TransferData data) { - // It is usual for the transfer data not to be set because it is available locally - return LocalSelectionTransfer.getTransfer().getSelection(); - } + @Override + protected Object getJavaObject(TransferData data) { + // It is usual for the transfer data not to be set because it is available locally + return LocalSelectionTransfer.getTransfer().getSelection(); + } + + @Override + protected TransactionalEditingDomain getTransactionalEditingDomain() { + return getEditingDomain(); + } + }); - @Override - protected TransactionalEditingDomain getTransactionalEditingDomain() { - return getEditingDomain(); - } - }); } /** @@ -520,10 +554,10 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh */ @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { - if(getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) { - IMultiDiagramEditor editor = (IMultiDiagramEditor)getSite().getPage().getActiveEditor(); + if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) { + IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor(); // If not the active editor, ignore selection changed. - if(this.equals(editor.getActiveEditor())) { + if (this.equals(editor.getActiveEditor())) { updateActions(getSelectionActions()); super.selectionChanged(part, selection); } else { @@ -535,7 +569,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh // from // org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart, // ISelection) - if(part == this) { + if (part == this) { rebuildStatusLine(); } } 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 350e8c45bde..8576ca6de1b 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 @@ -90,9 +90,11 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { instance = this; myLogHelper = new LogHelper(this); PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore()); - adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance().getItemProvidersAdapterFactory(); + adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance() + .getItemProvidersAdapterFactory(); DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer(); diagramPreferenceInitializer.initializeDefaultPreferences(); + } /** @@ -134,8 +136,8 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { * @generated */ public ImageDescriptor getItemImageDescriptor(Object item) { - IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(item, IItemLabelProvider.class); - if(labelProvider != null) { + IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(item, IItemLabelProvider.class); + if (labelProvider != null) { return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item)); } return null; @@ -166,8 +168,9 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { */ public static ImageDescriptor findImageDescriptor(String path) { final IPath p = new Path(path); - if(p.isAbsolute() && p.segmentCount() > 1) { - return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString()); + if (p.isAbsolute() && p.segmentCount() > 1) { + return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), + p.removeFirstSegments(1).makeAbsolute().toString()); } else { return getBundledImageDescriptor(p.makeAbsolute().toString()); } @@ -184,7 +187,7 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { */ public Image getBundledImage(String path) { Image image = getImageRegistry().get(path); - if(image == null) { + if (image == null) { getImageRegistry().put(path, getBundledImageDescriptor(path)); image = getImageRegistry().get(path); } @@ -204,7 +207,7 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { * @generated */ public UMLDocumentProvider getDocumentProvider() { - if(documentProvider == null) { + if (documentProvider == null) { documentProvider = new UMLDocumentProvider(); } return documentProvider; 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 77f90a8720c..9a4331d8666 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 @@ -85,9 +85,9 @@ public class UMLDiagramEditorUtil { public static boolean openDiagram(Resource diagram) throws PartInitException { String path = diagram.getURI().toPlatformString(true); IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path)); - if(workspaceResource instanceof IFile) { + if (workspaceResource instanceof IFile) { IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - return null != page.openEditor(new FileEditorInput((IFile)workspaceResource), UMLDiagramEditor.ID); + return null != page.openEditor(new FileEditorInput((IFile) workspaceResource), UMLDiagramEditor.ID); } return false; } @@ -96,7 +96,7 @@ public class UMLDiagramEditorUtil { * @generated */ public static void setCharset(IFile file) { - if(file == null) { + if (file == null) { return; } try { @@ -110,7 +110,8 @@ public class UMLDiagramEditorUtil { * @generated */ public static String getUniqueFileName(IPath containerFullPath, String fileName, String extension) { - return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension, DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE); + return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension, + DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE); } /** @@ -121,7 +122,7 @@ public class UMLDiagramEditorUtil { public static void runWizard(Shell shell, Wizard wizard, String settingsKey) { IDialogSettings pluginDialogSettings = UMLDiagramEditorPlugin.getInstance().getDialogSettings(); IDialogSettings wizardDialogSettings = pluginDialogSettings.getSection(settingsKey); - if(wizardDialogSettings == null) { + if (wizardDialogSettings == null) { wizardDialogSettings = pluginDialogSettings.addNewSection(settingsKey); } wizard.setDialogSettings(wizardDialogSettings); @@ -142,29 +143,37 @@ public class UMLDiagramEditorUtil { final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI); final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI); final String diagramName = diagramURI.lastSegment(); - AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) { - + AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, + Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) { @Override - protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { + protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { Profile model = createInitialModel(); attachModelToResource(model, modelResource); - Diagram diagram = ViewService.createDiagram(model, ProfileDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); - if(diagram != null) { + + Diagram diagram = ViewService.createDiagram(model, ProfileDiagramEditPart.MODEL_ID, + UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); + if (diagram != null) { diagramResource.getContents().add(diagram); diagram.setName(diagramName); diagram.setElement(model); } + try { - modelResource.save(org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorUtil.getSaveOptions()); - diagramResource.save(org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorUtil.getSaveOptions()); + modelResource + .save(org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorUtil.getSaveOptions()); + diagramResource + .save(org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorUtil.getSaveOptions()); } catch (IOException e) { + UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$ } return CommandResult.newOKCommandResult(); } }; try { - OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1), null); + OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1), + null); } catch (ExecutionException e) { UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$ } @@ -198,49 +207,56 @@ public class UMLDiagramEditorUtil { */ public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) { diagramPart.getDiagramGraphicalViewer().deselectAll(); + EditPart firstPrimary = null; - for(EditPart nextPart : editParts) { + for (EditPart nextPart : editParts) { diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart); - if(firstPrimary == null && nextPart instanceof IPrimaryEditPart) { + if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) { firstPrimary = nextPart; } } - if(!editParts.isEmpty()) { - diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart)editParts.get(0)); + + if (!editParts.isEmpty()) { + diagramPart.getDiagramGraphicalViewer() + .reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0)); } } /** * @generated */ - private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element, List<EditPart> editPartCollector) { - IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer)diagramPart.getViewer(); + private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element, + List<EditPart> editPartCollector) { + IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart.getViewer(); final int intialNumOfEditParts = editPartCollector.size(); - if(element instanceof View) { // support notation element lookup - EditPart editPart = (EditPart)viewer.getEditPartRegistry().get(element); - if(editPart != null) { + + if (element instanceof View) { // support notation element lookup + EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(element); + if (editPart != null) { editPartCollector.add(editPart); return 1; } } + String elementID = EMFCoreUtil.getProxyID(element); @SuppressWarnings("unchecked") List<EditPart> associatedParts = viewer.findEditPartsForElement(elementID, IGraphicalEditPart.class); // perform the possible hierarchy disjoint -> take the top-most parts only - for(EditPart nextPart : associatedParts) { + for (EditPart nextPart : associatedParts) { EditPart parentPart = nextPart.getParent(); - while(parentPart != null && !associatedParts.contains(parentPart)) { + while (parentPart != null && !associatedParts.contains(parentPart)) { parentPart = parentPart.getParent(); } - if(parentPart == null) { + if (parentPart == null) { editPartCollector.add(nextPart); } } - if(intialNumOfEditParts == editPartCollector.size()) { - if(!associatedParts.isEmpty()) { + + if (intialNumOfEditParts == editPartCollector.size()) { + if (!associatedParts.isEmpty()) { editPartCollector.add(associatedParts.get(0)); } else { - if(element.eContainer() != null) { + if (element.eContainer() != null) { return findElementsInDiagramByID(diagramPart, element.eContainer(), editPartCollector); } } @@ -251,19 +267,22 @@ public class UMLDiagramEditorUtil { /** * @generated */ - public static View findView(DiagramEditPart diagramEditPart, EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) { + public static View findView(DiagramEditPart diagramEditPart, EObject targetElement, + LazyElement2ViewMap lazyElement2ViewMap) { boolean hasStructuralURI = false; - if(targetElement.eResource() instanceof XMLResource) { - hasStructuralURI = ((XMLResource)targetElement.eResource()).getID(targetElement) == null; + if (targetElement.eResource() instanceof XMLResource) { + hasStructuralURI = ((XMLResource) targetElement.eResource()).getID(targetElement) == null; } + View view = null; LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>(); - if(hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) { + if (hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) { view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement); - } else if(findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) { + } else if (findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) { EditPart editPart = editPartHolder.get(0); - view = editPart.getModel() instanceof View ? (View)editPart.getModel() : null; + view = editPart.getModel() instanceof View ? (View) editPart.getModel() : null; } + return (view == null) ? diagramEditPart.getDiagramView() : view; } @@ -301,17 +320,18 @@ public class UMLDiagramEditorUtil { * @generated */ public final Map<EObject, View> getElement2ViewMap() { - if(element2ViewMap == null) { + if (element2ViewMap == null) { element2ViewMap = new HashMap<EObject, View>(); // map possible notation elements to itself as these can't be found by view.getElement() - for(EObject element : elementSet) { - if(element instanceof View) { - View view = (View)element; - if(view.getDiagram() == scope.getDiagram()) { + for (EObject element : elementSet) { + if (element instanceof View) { + View view = (View) element; + if (view.getDiagram() == scope.getDiagram()) { element2ViewMap.put(element, view); // take only those that part of our diagram } } } + buildElement2ViewMap(scope, element2ViewMap, elementSet); } return element2ViewMap; @@ -320,25 +340,28 @@ public class UMLDiagramEditorUtil { /** * @generated */ - private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap, Set<? extends EObject> elements) { - if(elements.size() == element2ViewMap.size()) { + private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap, + Set<? extends EObject> elements) { + if (elements.size() == element2ViewMap.size()) { return true; } - if(parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) { + + if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) + && elements.contains(parentView.getElement())) { element2ViewMap.put(parentView.getElement(), parentView); - if(elements.size() == element2ViewMap.size()) { + if (elements.size() == element2ViewMap.size()) { return true; } } boolean complete = false; - for(Iterator<?> it = parentView.getChildren().iterator(); it.hasNext() && !complete;) { - complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements); + for (Iterator<?> it = parentView.getChildren().iterator(); it.hasNext() && !complete;) { + complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements); } - for(Iterator<?> it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) { - complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements); + for (Iterator<?> it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) { + complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements); } - for(Iterator<?> it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) { - complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements); + for (Iterator<?> it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) { + complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements); } return complete; } 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 565662a1075..0b60d06be80 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 @@ -137,137 +137,137 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLNodeDescriptor> getSemanticChildren(View view) { String vid = UMLVisualIDRegistry.getVisualID(view); - if(vid != null) { - switch(vid) { + if (vid != null) { + switch (vid) { case ProfileDiagramEditPart.VISUAL_ID: - return getProfile_1000SemanticChildren(view); + return getProfile_ProfileDiagram_SemanticChildren(view); case PackageEditPartCN.VISUAL_ID: - return getPackage_1012SemanticChildren(view); + return getPackage_Shape_CN_SemanticChildren(view); case PackagePackageableElementCompartmentEditPart.VISUAL_ID: - return getPackagePackagedelements_1005SemanticChildren(view); + return getPackage_PackagedElementCompartment_SemanticChildren(view); case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID: - return getPackagePackagedelements_11SemanticChildren(view); + return getPackage_PackagedElementCompartment_CN_SemanticChildren(view); case ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID: - return getProfilePackagedelements_1042SemanticChildren(view); + return getProfile_PackagedElementCompartment_SemanticChildren(view); case ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID: - return getProfilePackagedelements_1051SemanticChildren(view); + return getProfile_PackagedElementCompartment_CN_SemanticChildren(view); case StereotypeAttributeCompartmentEditPart.VISUAL_ID: - return getStereotypeAttributes_1071SemanticChildren(view); + return getStereotype_AttributeCompartment_SemanticChildren(view); case StereotypeAttributeCompartmentEditPartCN.VISUAL_ID: - return getStereotypeAttributes_1052SemanticChildren(view); + return getStereotype_AttributeCompartment_CN_SemanticChildren(view); case StereotypeOperationCompartmentEditPart.VISUAL_ID: - return getStereotypeOperations_1019SemanticChildren(view); + return getStereotype_OperationCompartment_SemanticChildren(view); case StereotypeOperationCompartmentEditPartCN.VISUAL_ID: - return getStereotypeOperations_1053SemanticChildren(view); + return getStereotype_OperationCompartment_CN_SemanticChildren(view); case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID: - return getModelPackagedelements_1057SemanticChildren(view); + return getModel_PackagedElementCompartment_SemanticChildren(view); case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID: - return getModelPackagedelements_1058SemanticChildren(view); + return getModel_PackagedElementCompartment_CN_SemanticChildren(view); case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID: - return getEnumerationLiterals_1062SemanticChildren(view); + return getEnumeration_LiteralCompartment_CN_SemanticChildren(view); case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID: - return getEnumerationLiterals_1063SemanticChildren(view); + return getEnumeration_LiteralCompartment_SemanticChildren(view); case DataTypeAttributeCompartmentEditPart.VISUAL_ID: - return getDataTypeAttributes_1067SemanticChildren(view); + return getDataType_AttributeCompartment_SemanticChildren(view); case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID: - return getDataTypeAttributes_1069SemanticChildren(view); + return getDataType_AttributeCompartment_CN_SemanticChildren(view); case DataTypeOperationCompartmentEditPart.VISUAL_ID: - return getDataTypeOperations_1068SemanticChildren(view); + return getDataType_OperationCompartment_SemanticChildren(view); case DataTypeOperationCompartmentEditPartCN.VISUAL_ID: - return getDataTypeOperations_1070SemanticChildren(view); + return getDataType_OperationCompartment_CN_SemanticChildren(view); case ClassAttributeCompartmentEditPart.VISUAL_ID: - return getClassAttributes_7017SemanticChildren(view); + return getClass_AttributeCompartment_SemanticChildren(view); case ClassAttributeCompartmentEditPartCN.VISUAL_ID: - return getClassAttributes_7011SemanticChildren(view); + return getClass_AttributeCompartment_CN_SemanticChildren(view); case ClassOperationCompartmentEditPart.VISUAL_ID: - return getClassOperations_7018SemanticChildren(view); + return getClass_OperationCompartment_SemanticChildren(view); case ClassOperationCompartmentEditPartCN.VISUAL_ID: - return getClassOperations_7012SemanticChildren(view); + return getClass_OperationCompartment_CN_SemanticChildren(view); } } return Collections.emptyList(); } /** - * @generated - */ - public List<UMLNodeDescriptor> getProfile_1000SemanticChildren(View view) { - if(!view.isSetElement()) { + * @generated + */ + public List<UMLNodeDescriptor> getProfile_ProfileDiagram_SemanticChildren(View view) { + if (!view.isSetElement()) { return Collections.emptyList(); } - Profile modelElement = (Profile)view.getElement(); + Profile modelElement = (Profile) view.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { - PackageableElement childElement = (PackageableElement)it.next(); + for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(DependencyNodeEditPart.VISUAL_ID.equals(visualID)) { + if (DependencyNodeEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(AssociationNodeEditPart.VISUAL_ID.equals(visualID)) { + if (AssociationNodeEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ClassEditPart.VISUAL_ID.equals(visualID)) { + if (ClassEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(MetaclassEditPart.VISUAL_ID.equals(visualID)) { + if (MetaclassEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ConstraintEditPart.VISUAL_ID.equals(visualID)) { + if (ConstraintEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ModelEditPartTN.VISUAL_ID.equals(visualID)) { + if (ModelEditPartTN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ProfileEditPartTN.VISUAL_ID.equals(visualID)) { + if (ProfileEditPartTN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PackageEditPart.VISUAL_ID.equals(visualID)) { + if (PackageEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(EnumerationEditPart.VISUAL_ID.equals(visualID)) { + if (EnumerationEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PrimitiveTypeEditPart.VISUAL_ID.equals(visualID)) { + if (PrimitiveTypeEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(DataTypeEditPart.VISUAL_ID.equals(visualID)) { + if (DataTypeEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { - Stereotype childElement = (Stereotype)it.next(); + for (Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { + Stereotype childElement = (Stereotype) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(StereotypeEditPart.VISUAL_ID.equals(visualID)) { + if (StereotypeEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { - Comment childElement = (Comment)it.next(); + for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(CommentEditPart.VISUAL_ID.equals(visualID)) { + if (CommentEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } Resource resource = modelElement.eResource(); - for(Iterator<EObject> it = getPhantomNodesIterator(resource); it.hasNext();) { + for (Iterator<EObject> it = getPhantomNodesIterator(resource); it.hasNext();) { EObject childElement = it.next(); - if(childElement == modelElement) { + if (childElement == modelElement) { continue; } - if(UMLVisualIDRegistry.getNodeVisualID(view, childElement) == ShortCutDiagramEditPart.VISUAL_ID) { + if (UMLVisualIDRegistry.getNodeVisualID(view, childElement) == ShortCutDiagramEditPart.VISUAL_ID) { result.add(new UMLNodeDescriptor(childElement, ShortCutDiagramEditPart.VISUAL_ID)); continue; } @@ -278,16 +278,16 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getPackage_1012SemanticChildren(View view) { - if(!view.isSetElement()) { + public List<UMLNodeDescriptor> getPackage_Shape_CN_SemanticChildren(View view) { + if (!view.isSetElement()) { return Collections.emptyList(); } - Package modelElement = (Package)view.getElement(); + Package modelElement = (Package) view.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { - PackageableElement childElement = (PackageableElement)it.next(); + for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(PackageEditPartCN.VISUAL_ID.equals(visualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -298,64 +298,64 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getPackagePackagedelements_1005SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getPackage_PackagedElementCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Package modelElement = (Package)containerView.getElement(); + Package modelElement = (Package) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { - Comment childElement = (Comment)it.next(); + for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(CommentEditPartCN.VISUAL_ID.equals(visualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { - PackageableElement childElement = (PackageableElement)it.next(); + for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ModelEditPartCN.VISUAL_ID.equals(visualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ProfileEditPartCN.VISUAL_ID.equals(visualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PackageEditPartCN.VISUAL_ID.equals(visualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ClassEditPartCN.VISUAL_ID.equals(visualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { - Stereotype childElement = (Stereotype)it.next(); + for (Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { + Stereotype childElement = (Stereotype) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(StereotypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (StereotypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -366,64 +366,64 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getPackagePackagedelements_11SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getPackage_PackagedElementCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Package modelElement = (Package)containerView.getElement(); + Package modelElement = (Package) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { - Comment childElement = (Comment)it.next(); + for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(CommentEditPartCN.VISUAL_ID.equals(visualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { - PackageableElement childElement = (PackageableElement)it.next(); + for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ModelEditPartCN.VISUAL_ID.equals(visualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ProfileEditPartCN.VISUAL_ID.equals(visualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PackageEditPartCN.VISUAL_ID.equals(visualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ClassEditPartCN.VISUAL_ID.equals(visualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { - Stereotype childElement = (Stereotype)it.next(); + for (Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { + Stereotype childElement = (Stereotype) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(StereotypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (StereotypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -434,68 +434,68 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getProfilePackagedelements_1042SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getProfile_PackagedElementCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Profile modelElement = (Profile)containerView.getElement(); + Profile modelElement = (Profile) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { - Stereotype childElement = (Stereotype)it.next(); + for (Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { + Stereotype childElement = (Stereotype) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(StereotypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (StereotypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { - PackageableElement childElement = (PackageableElement)it.next(); + for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ModelEditPartCN.VISUAL_ID.equals(visualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ProfileEditPartCN.VISUAL_ID.equals(visualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PackageEditPartCN.VISUAL_ID.equals(visualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(MetaclassEditPartCN.VISUAL_ID.equals(visualID)) { + if (MetaclassEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ClassEditPartCN.VISUAL_ID.equals(visualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { - Comment childElement = (Comment)it.next(); + for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(CommentEditPartCN.VISUAL_ID.equals(visualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -506,68 +506,68 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getProfilePackagedelements_1051SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getProfile_PackagedElementCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Profile modelElement = (Profile)containerView.getElement(); + Profile modelElement = (Profile) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { - Stereotype childElement = (Stereotype)it.next(); + for (Iterator<?> it = modelElement.getOwnedStereotypes().iterator(); it.hasNext();) { + Stereotype childElement = (Stereotype) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(StereotypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (StereotypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { - PackageableElement childElement = (PackageableElement)it.next(); + for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ModelEditPartCN.VISUAL_ID.equals(visualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ProfileEditPartCN.VISUAL_ID.equals(visualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PackageEditPartCN.VISUAL_ID.equals(visualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(MetaclassEditPartCN.VISUAL_ID.equals(visualID)) { + if (MetaclassEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ClassEditPartCN.VISUAL_ID.equals(visualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { - Comment childElement = (Comment)it.next(); + for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(CommentEditPartCN.VISUAL_ID.equals(visualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -578,20 +578,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getStereotypeAttributes_1071SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getStereotype_AttributeCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Stereotype modelElement = (Stereotype)containerView.getElement(); + Stereotype modelElement = (Stereotype) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { - Property childElement = (Property)it.next(); + for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ClassPropertyEditPart.VISUAL_ID.equals(visualID)) { + if (ClassPropertyEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -602,20 +602,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getStereotypeAttributes_1052SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getStereotype_AttributeCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Stereotype modelElement = (Stereotype)containerView.getElement(); + Stereotype modelElement = (Stereotype) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { - Property childElement = (Property)it.next(); + for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ClassPropertyEditPart.VISUAL_ID.equals(visualID)) { + if (ClassPropertyEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -626,20 +626,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getStereotypeOperations_1019SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getStereotype_OperationCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Stereotype modelElement = (Stereotype)containerView.getElement(); + Stereotype modelElement = (Stereotype) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { - Operation childElement = (Operation)it.next(); + for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ClassOperationEditPart.VISUAL_ID.equals(visualID)) { + if (ClassOperationEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -650,20 +650,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getStereotypeOperations_1053SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getStereotype_OperationCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Stereotype modelElement = (Stereotype)containerView.getElement(); + Stereotype modelElement = (Stereotype) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { - Operation childElement = (Operation)it.next(); + for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ClassOperationEditPart.VISUAL_ID.equals(visualID)) { + if (ClassOperationEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -674,56 +674,56 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getModelPackagedelements_1057SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getModel_PackagedElementCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Model modelElement = (Model)containerView.getElement(); + Model modelElement = (Model) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { - Comment childElement = (Comment)it.next(); + for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(CommentEditPartCN.VISUAL_ID.equals(visualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { - PackageableElement childElement = (PackageableElement)it.next(); + for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ModelEditPartCN.VISUAL_ID.equals(visualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ProfileEditPartCN.VISUAL_ID.equals(visualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PackageEditPartCN.VISUAL_ID.equals(visualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ClassEditPartCN.VISUAL_ID.equals(visualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -734,56 +734,56 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getModelPackagedelements_1058SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getModel_PackagedElementCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Model modelElement = (Model)containerView.getElement(); + Model modelElement = (Model) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { - Comment childElement = (Comment)it.next(); + for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(CommentEditPartCN.VISUAL_ID.equals(visualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } } - for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { - PackageableElement childElement = (PackageableElement)it.next(); + for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ModelEditPartCN.VISUAL_ID.equals(visualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ProfileEditPartCN.VISUAL_ID.equals(visualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PackageEditPartCN.VISUAL_ID.equals(visualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } - if(ClassEditPartCN.VISUAL_ID.equals(visualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -794,20 +794,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getEnumerationLiterals_1062SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getEnumeration_LiteralCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Enumeration modelElement = (Enumeration)containerView.getElement(); + Enumeration modelElement = (Enumeration) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) { - EnumerationLiteral childElement = (EnumerationLiteral)it.next(); + for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) { + EnumerationLiteral childElement = (EnumerationLiteral) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(EnumerationLiteralEditPart.VISUAL_ID.equals(visualID)) { + if (EnumerationLiteralEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -818,20 +818,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getEnumerationLiterals_1063SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getEnumeration_LiteralCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Enumeration modelElement = (Enumeration)containerView.getElement(); + Enumeration modelElement = (Enumeration) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) { - EnumerationLiteral childElement = (EnumerationLiteral)it.next(); + for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) { + EnumerationLiteral childElement = (EnumerationLiteral) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(EnumerationLiteralEditPart.VISUAL_ID.equals(visualID)) { + if (EnumerationLiteralEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -842,20 +842,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getDataTypeAttributes_1067SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getDataType_AttributeCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - DataType modelElement = (DataType)containerView.getElement(); + DataType modelElement = (DataType) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { - Property childElement = (Property)it.next(); + for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(DataTypePropertyEditPart.VISUAL_ID.equals(visualID)) { + if (DataTypePropertyEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -866,20 +866,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getDataTypeAttributes_1069SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getDataType_AttributeCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - DataType modelElement = (DataType)containerView.getElement(); + DataType modelElement = (DataType) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { - Property childElement = (Property)it.next(); + for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(DataTypePropertyEditPart.VISUAL_ID.equals(visualID)) { + if (DataTypePropertyEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -890,20 +890,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getDataTypeOperations_1068SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getDataType_OperationCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - DataType modelElement = (DataType)containerView.getElement(); + DataType modelElement = (DataType) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { - Operation childElement = (Operation)it.next(); + for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(DataTypeOperationEditPart.VISUAL_ID.equals(visualID)) { + if (DataTypeOperationEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -914,20 +914,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getDataTypeOperations_1070SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getDataType_OperationCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - DataType modelElement = (DataType)containerView.getElement(); + DataType modelElement = (DataType) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { - Operation childElement = (Operation)it.next(); + for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(DataTypeOperationEditPart.VISUAL_ID.equals(visualID)) { + if (DataTypeOperationEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -938,20 +938,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getClassAttributes_7017SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getClass_AttributeCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Class modelElement = (Class)containerView.getElement(); + Class modelElement = (Class) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { - Property childElement = (Property)it.next(); + for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ClassPropertyEditPart.VISUAL_ID.equals(visualID)) { + if (ClassPropertyEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -962,20 +962,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getClassAttributes_7011SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getClass_AttributeCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Class modelElement = (Class)containerView.getElement(); + Class modelElement = (Class) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { - Property childElement = (Property)it.next(); + for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ClassPropertyEditPart.VISUAL_ID.equals(visualID)) { + if (ClassPropertyEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -986,20 +986,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getClassOperations_7018SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getClass_OperationCompartment_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Class modelElement = (Class)containerView.getElement(); + Class modelElement = (Class) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { - Operation childElement = (Operation)it.next(); + for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ClassOperationEditPart.VISUAL_ID.equals(visualID)) { + if (ClassOperationEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -1010,20 +1010,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - public List<UMLNodeDescriptor> getClassOperations_7012SemanticChildren(View view) { - if(false == view.eContainer() instanceof View) { + public List<UMLNodeDescriptor> getClass_OperationCompartment_CN_SemanticChildren(View view) { + if (false == view.eContainer() instanceof View) { return Collections.emptyList(); } - View containerView = (View)view.eContainer(); - if(!containerView.isSetElement()) { + View containerView = (View) view.eContainer(); + if (!containerView.isSetElement()) { return Collections.emptyList(); } - Class modelElement = (Class)containerView.getElement(); + Class modelElement = (Class) containerView.getElement(); LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { - Operation childElement = (Operation)it.next(); + for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); - if(ClassOperationEditPart.VISUAL_ID.equals(visualID)) { + if (ClassOperationEditPart.VISUAL_ID.equals(visualID)) { result.add(new UMLNodeDescriptor(childElement, visualID)); continue; } @@ -1043,88 +1043,88 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getContainedLinks(View view) { String vid = UMLVisualIDRegistry.getVisualID(view); - if(vid != null) { - switch(vid) { + if (vid != null) { + switch (vid) { case ProfileDiagramEditPart.VISUAL_ID: - return getProfile_1000ContainedLinks(view); + return getProfile_ProfileDiagram_ContainedLinks(view); case DependencyNodeEditPart.VISUAL_ID: - return getDependency_2014ContainedLinks(view); + return getDependency_Shape_ContainedLinks(view); case AssociationNodeEditPart.VISUAL_ID: - return getAssociation_2015ContainedLinks(view); + return getAssociation_Shape_ContainedLinks(view); case StereotypeEditPart.VISUAL_ID: - return getStereotype_1026ContainedLinks(view); + return getStereotype_Shape_ContainedLinks(view); case ClassEditPart.VISUAL_ID: - return getClass_2008ContainedLinks(view); + return getClass_Shape_ContainedLinks(view); case MetaclassEditPart.VISUAL_ID: - return getClass_1031ContainedLinks(view); + return getClass_MetaclassShape_ContainedLinks(view); case CommentEditPart.VISUAL_ID: - return getComment_1002ContainedLinks(view); + return getComment_Shape_ContainedLinks(view); case ConstraintEditPart.VISUAL_ID: - return getConstraint_1014ContainedLinks(view); + return getConstraint_PackagedElementShape_ContainedLinks(view); case ModelEditPartTN.VISUAL_ID: - return getModel_2005ContainedLinks(view); + return getModel_Shape_ContainedLinks(view); case ProfileEditPartTN.VISUAL_ID: - return getProfile_1030ContainedLinks(view); + return getProfile_Shape_ContainedLinks(view); case PackageEditPart.VISUAL_ID: - return getPackage_2007ContainedLinks(view); + return getPackage_Shape_ContainedLinks(view); case EnumerationEditPart.VISUAL_ID: - return getEnumeration_2006ContainedLinks(view); + return getEnumeration_Shape_ContainedLinks(view); case PrimitiveTypeEditPart.VISUAL_ID: - return getPrimitiveType_2009ContainedLinks(view); + return getPrimitiveType_Shape_ContainedLinks(view); case DataTypeEditPart.VISUAL_ID: - return getDataType_2010ContainedLinks(view); + return getDataType_Shape_ContainedLinks(view); case ShortCutDiagramEditPart.VISUAL_ID: - return getDiagram_2016ContainedLinks(view); + return getDiagram_ShortcutShape_ContainedLinks(view); case PrimitiveTypeEditPartCN.VISUAL_ID: - return getPrimitiveType_3026ContainedLinks(view); + return getPrimitiveType_Shape_CN_ContainedLinks(view); case DataTypeOperationEditPart.VISUAL_ID: - return getOperation_3019ContainedLinks(view); + return getOperation_DataTypeOperationLabel_ContainedLinks(view); case EnumerationLiteralEditPart.VISUAL_ID: - return getEnumerationLiteral_1037ContainedLinks(view); + return getEnumerationLiteral_LiteralLabel_ContainedLinks(view); case DataTypePropertyEditPart.VISUAL_ID: - return getProperty_3018ContainedLinks(view); + return getProperty_DataTypeAttributeLabel_ContainedLinks(view); case ClassPropertyEditPart.VISUAL_ID: - return getProperty_3002ContainedLinks(view); + return getProperty_ClassAttributeLabel_ContainedLinks(view); case ClassOperationEditPart.VISUAL_ID: - return getOperation_3020ContainedLinks(view); + return getOperation_ClassOperationLabel_ContainedLinks(view); case StereotypeEditPartCN.VISUAL_ID: - return getStereotype_1023ContainedLinks(view); + return getStereotype_Shape_CN_ContainedLinks(view); case ClassEditPartCN.VISUAL_ID: - return getClass_3010ContainedLinks(view); + return getClass_Shape_CN_ContainedLinks(view); case MetaclassEditPartCN.VISUAL_ID: - return getClass_3028ContainedLinks(view); + return getClass_MetaclassShape_CN_ContainedLinks(view); case CommentEditPartCN.VISUAL_ID: - return getComment_1007ContainedLinks(view); + return getComment_Shape_CN_ContainedLinks(view); case ModelEditPartCN.VISUAL_ID: - return getModel_1027ContainedLinks(view); + return getModel_Shape_CN_ContainedLinks(view); case ProfileEditPartCN.VISUAL_ID: - return getProfile_1024ContainedLinks(view); + return getProfile_Shape_CN_ContainedLinks(view); case PackageEditPartCN.VISUAL_ID: - return getPackage_1012ContainedLinks(view); + return getPackage_Shape_CN_ContainedLinks(view); case ConstraintEditPartCN.VISUAL_ID: - return getConstraint_1028ContainedLinks(view); + return getConstraint_PackagedElementShape_CN_ContainedLinks(view); case EnumerationEditPartCN.VISUAL_ID: - return getEnumeration_3025ContainedLinks(view); + return getEnumeration_Shape_CN_ContainedLinks(view); case DataTypeEditPartCN.VISUAL_ID: - return getDataType_3027ContainedLinks(view); + return getDataType_Shape_CN_ContainedLinks(view); case ExtensionEditPart.VISUAL_ID: - return getExtension_1013ContainedLinks(view); + return getExtension_Edge_ContainedLinks(view); case AssociationEditPart.VISUAL_ID: - return getAssociation_4001ContainedLinks(view); + return getAssociation_Edge_ContainedLinks(view); case ProfileApplicationEditPart.VISUAL_ID: - return getProfileApplication_1045ContainedLinks(view); + return getProfileApplication_Edge_ContainedLinks(view); case AssociationBranchEditPart.VISUAL_ID: - return getAssociation_4019ContainedLinks(view); + return getAssociation_BranchEdge_ContainedLinks(view); case GeneralizationEditPart.VISUAL_ID: - return getGeneralization_4002ContainedLinks(view); + return getGeneralization_Edge_ContainedLinks(view); case DependencyEditPart.VISUAL_ID: - return getDependency_4008ContainedLinks(view); + return getDependency_Edge_ContainedLinks(view); case DependencyBranchEditPart.VISUAL_ID: - return getDependency_4018ContainedLinks(view); + return getDependency_BranchEdge_ContainedLinks(view); case ElementImportEditPart.VISUAL_ID: - return getElementImport_1064ContainedLinks(view); + return getElementImport_Edge_ContainedLinks(view); case PackageImportEditPart.VISUAL_ID: - return getPackageImport_1065ContainedLinks(view); + return getPackageImport_Edge_ContainedLinks(view); } } return Collections.emptyList(); @@ -1135,86 +1135,86 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getIncomingLinks(View view) { String vid = UMLVisualIDRegistry.getVisualID(view); - if(vid != null) { - switch(vid) { + if (vid != null) { + switch (vid) { case DependencyNodeEditPart.VISUAL_ID: - return getDependency_2014IncomingLinks(view); + return getDependency_Shape_IncomingLinks(view); case AssociationNodeEditPart.VISUAL_ID: - return getAssociation_2015IncomingLinks(view); + return getAssociation_Shape_IncomingLinks(view); case StereotypeEditPart.VISUAL_ID: - return getStereotype_1026IncomingLinks(view); + return getStereotype_Shape_IncomingLinks(view); case ClassEditPart.VISUAL_ID: - return getClass_2008IncomingLinks(view); + return getClass_Shape_IncomingLinks(view); case MetaclassEditPart.VISUAL_ID: - return getClass_1031IncomingLinks(view); + return getClass_MetaclassShape_IncomingLinks(view); case CommentEditPart.VISUAL_ID: - return getComment_1002IncomingLinks(view); + return getComment_Shape_IncomingLinks(view); case ConstraintEditPart.VISUAL_ID: - return getConstraint_1014IncomingLinks(view); + return getConstraint_PackagedElementShape_IncomingLinks(view); case ModelEditPartTN.VISUAL_ID: - return getModel_2005IncomingLinks(view); + return getModel_Shape_IncomingLinks(view); case ProfileEditPartTN.VISUAL_ID: - return getProfile_1030IncomingLinks(view); + return getProfile_Shape_IncomingLinks(view); case PackageEditPart.VISUAL_ID: - return getPackage_2007IncomingLinks(view); + return getPackage_Shape_IncomingLinks(view); case EnumerationEditPart.VISUAL_ID: - return getEnumeration_2006IncomingLinks(view); + return getEnumeration_Shape_IncomingLinks(view); case PrimitiveTypeEditPart.VISUAL_ID: - return getPrimitiveType_2009IncomingLinks(view); + return getPrimitiveType_Shape_IncomingLinks(view); case DataTypeEditPart.VISUAL_ID: - return getDataType_2010IncomingLinks(view); + return getDataType_Shape_IncomingLinks(view); case ShortCutDiagramEditPart.VISUAL_ID: - return getDiagram_2016IncomingLinks(view); + return getDiagram_ShortcutShape_IncomingLinks(view); case PrimitiveTypeEditPartCN.VISUAL_ID: - return getPrimitiveType_3026IncomingLinks(view); + return getPrimitiveType_Shape_CN_IncomingLinks(view); case DataTypeOperationEditPart.VISUAL_ID: - return getOperation_3019IncomingLinks(view); + return getOperation_DataTypeOperationLabel_IncomingLinks(view); case EnumerationLiteralEditPart.VISUAL_ID: - return getEnumerationLiteral_1037IncomingLinks(view); + return getEnumerationLiteral_LiteralLabel_IncomingLinks(view); case DataTypePropertyEditPart.VISUAL_ID: - return getProperty_3018IncomingLinks(view); + return getProperty_DataTypeAttributeLabel_IncomingLinks(view); case ClassPropertyEditPart.VISUAL_ID: - return getProperty_3002IncomingLinks(view); + return getProperty_ClassAttributeLabel_IncomingLinks(view); case ClassOperationEditPart.VISUAL_ID: - return getOperation_3020IncomingLinks(view); + return getOperation_ClassOperationLabel_IncomingLinks(view); case StereotypeEditPartCN.VISUAL_ID: - return getStereotype_1023IncomingLinks(view); + return getStereotype_Shape_CN_IncomingLinks(view); case ClassEditPartCN.VISUAL_ID: - return getClass_3010IncomingLinks(view); + return getClass_Shape_CN_IncomingLinks(view); case MetaclassEditPartCN.VISUAL_ID: - return getClass_3028IncomingLinks(view); + return getClass_MetaclassShape_CN_IncomingLinks(view); case CommentEditPartCN.VISUAL_ID: - return getComment_1007IncomingLinks(view); + return getComment_Shape_CN_IncomingLinks(view); case ModelEditPartCN.VISUAL_ID: - return getModel_1027IncomingLinks(view); + return getModel_Shape_CN_IncomingLinks(view); case ProfileEditPartCN.VISUAL_ID: - return getProfile_1024IncomingLinks(view); + return getProfile_Shape_CN_IncomingLinks(view); case PackageEditPartCN.VISUAL_ID: - return getPackage_1012IncomingLinks(view); + return getPackage_Shape_CN_IncomingLinks(view); case ConstraintEditPartCN.VISUAL_ID: - return getConstraint_1028IncomingLinks(view); + return getConstraint_PackagedElementShape_CN_IncomingLinks(view); case EnumerationEditPartCN.VISUAL_ID: - return getEnumeration_3025IncomingLinks(view); + return getEnumeration_Shape_CN_IncomingLinks(view); case DataTypeEditPartCN.VISUAL_ID: - return getDataType_3027IncomingLinks(view); + return getDataType_Shape_CN_IncomingLinks(view); case ExtensionEditPart.VISUAL_ID: - return getExtension_1013IncomingLinks(view); + return getExtension_Edge_IncomingLinks(view); case AssociationEditPart.VISUAL_ID: - return getAssociation_4001IncomingLinks(view); + return getAssociation_Edge_IncomingLinks(view); case ProfileApplicationEditPart.VISUAL_ID: - return getProfileApplication_1045IncomingLinks(view); + return getProfileApplication_Edge_IncomingLinks(view); case AssociationBranchEditPart.VISUAL_ID: - return getAssociation_4019IncomingLinks(view); + return getAssociation_BranchEdge_IncomingLinks(view); case GeneralizationEditPart.VISUAL_ID: - return getGeneralization_4002IncomingLinks(view); + return getGeneralization_Edge_IncomingLinks(view); case DependencyEditPart.VISUAL_ID: - return getDependency_4008IncomingLinks(view); + return getDependency_Edge_IncomingLinks(view); case DependencyBranchEditPart.VISUAL_ID: - return getDependency_4018IncomingLinks(view); + return getDependency_BranchEdge_IncomingLinks(view); case ElementImportEditPart.VISUAL_ID: - return getElementImport_1064IncomingLinks(view); + return getElementImport_Edge_IncomingLinks(view); case PackageImportEditPart.VISUAL_ID: - return getPackageImport_1065IncomingLinks(view); + return getPackageImport_Edge_IncomingLinks(view); } } return Collections.emptyList(); @@ -1225,1657 +1225,1724 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getOutgoingLinks(View view) { String vid = UMLVisualIDRegistry.getVisualID(view); - if(vid != null) { - switch(vid) { + if (vid != null) { + switch (vid) { case DependencyNodeEditPart.VISUAL_ID: - return getDependency_2014OutgoingLinks(view); + return getDependency_Shape_OutgoingLinks(view); case AssociationNodeEditPart.VISUAL_ID: - return getAssociation_2015OutgoingLinks(view); + return getAssociation_Shape_OutgoingLinks(view); case StereotypeEditPart.VISUAL_ID: - return getStereotype_1026OutgoingLinks(view); + return getStereotype_Shape_OutgoingLinks(view); case ClassEditPart.VISUAL_ID: - return getClass_2008OutgoingLinks(view); + return getClass_Shape_OutgoingLinks(view); case MetaclassEditPart.VISUAL_ID: - return getClass_1031OutgoingLinks(view); + return getClass_MetaclassShape_OutgoingLinks(view); case CommentEditPart.VISUAL_ID: - return getComment_1002OutgoingLinks(view); + return getComment_Shape_OutgoingLinks(view); case ConstraintEditPart.VISUAL_ID: - return getConstraint_1014OutgoingLinks(view); + return getConstraint_PackagedElementShape_OutgoingLinks(view); case ModelEditPartTN.VISUAL_ID: - return getModel_2005OutgoingLinks(view); + return getModel_Shape_OutgoingLinks(view); case ProfileEditPartTN.VISUAL_ID: - return getProfile_1030OutgoingLinks(view); + return getProfile_Shape_OutgoingLinks(view); case PackageEditPart.VISUAL_ID: - return getPackage_2007OutgoingLinks(view); + return getPackage_Shape_OutgoingLinks(view); case EnumerationEditPart.VISUAL_ID: - return getEnumeration_2006OutgoingLinks(view); + return getEnumeration_Shape_OutgoingLinks(view); case PrimitiveTypeEditPart.VISUAL_ID: - return getPrimitiveType_2009OutgoingLinks(view); + return getPrimitiveType_Shape_OutgoingLinks(view); case DataTypeEditPart.VISUAL_ID: - return getDataType_2010OutgoingLinks(view); + return getDataType_Shape_OutgoingLinks(view); case ShortCutDiagramEditPart.VISUAL_ID: - return getDiagram_2016OutgoingLinks(view); + return getDiagram_ShortcutShape_OutgoingLinks(view); case PrimitiveTypeEditPartCN.VISUAL_ID: - return getPrimitiveType_3026OutgoingLinks(view); + return getPrimitiveType_Shape_CN_OutgoingLinks(view); case DataTypeOperationEditPart.VISUAL_ID: - return getOperation_3019OutgoingLinks(view); + return getOperation_DataTypeOperationLabel_OutgoingLinks(view); case EnumerationLiteralEditPart.VISUAL_ID: - return getEnumerationLiteral_1037OutgoingLinks(view); + return getEnumerationLiteral_LiteralLabel_OutgoingLinks(view); case DataTypePropertyEditPart.VISUAL_ID: - return getProperty_3018OutgoingLinks(view); + return getProperty_DataTypeAttributeLabel_OutgoingLinks(view); case ClassPropertyEditPart.VISUAL_ID: - return getProperty_3002OutgoingLinks(view); + return getProperty_ClassAttributeLabel_OutgoingLinks(view); case ClassOperationEditPart.VISUAL_ID: - return getOperation_3020OutgoingLinks(view); + return getOperation_ClassOperationLabel_OutgoingLinks(view); case StereotypeEditPartCN.VISUAL_ID: - return getStereotype_1023OutgoingLinks(view); + return getStereotype_Shape_CN_OutgoingLinks(view); case ClassEditPartCN.VISUAL_ID: - return getClass_3010OutgoingLinks(view); + return getClass_Shape_CN_OutgoingLinks(view); case MetaclassEditPartCN.VISUAL_ID: - return getClass_3028OutgoingLinks(view); + return getClass_MetaclassShape_CN_OutgoingLinks(view); case CommentEditPartCN.VISUAL_ID: - return getComment_1007OutgoingLinks(view); + return getComment_Shape_CN_OutgoingLinks(view); case ModelEditPartCN.VISUAL_ID: - return getModel_1027OutgoingLinks(view); + return getModel_Shape_CN_OutgoingLinks(view); case ProfileEditPartCN.VISUAL_ID: - return getProfile_1024OutgoingLinks(view); + return getProfile_Shape_CN_OutgoingLinks(view); case PackageEditPartCN.VISUAL_ID: - return getPackage_1012OutgoingLinks(view); + return getPackage_Shape_CN_OutgoingLinks(view); case ConstraintEditPartCN.VISUAL_ID: - return getConstraint_1028OutgoingLinks(view); + return getConstraint_PackagedElementShape_CN_OutgoingLinks(view); case EnumerationEditPartCN.VISUAL_ID: - return getEnumeration_3025OutgoingLinks(view); + return getEnumeration_Shape_CN_OutgoingLinks(view); case DataTypeEditPartCN.VISUAL_ID: - return getDataType_3027OutgoingLinks(view); + return getDataType_Shape_CN_OutgoingLinks(view); case ExtensionEditPart.VISUAL_ID: - return getExtension_1013OutgoingLinks(view); + return getExtension_Edge_OutgoingLinks(view); case AssociationEditPart.VISUAL_ID: - return getAssociation_4001OutgoingLinks(view); + return getAssociation_Edge_OutgoingLinks(view); case ProfileApplicationEditPart.VISUAL_ID: - return getProfileApplication_1045OutgoingLinks(view); + return getProfileApplication_Edge_OutgoingLinks(view); case AssociationBranchEditPart.VISUAL_ID: - return getAssociation_4019OutgoingLinks(view); + return getAssociation_BranchEdge_OutgoingLinks(view); case GeneralizationEditPart.VISUAL_ID: - return getGeneralization_4002OutgoingLinks(view); + return getGeneralization_Edge_OutgoingLinks(view); case DependencyEditPart.VISUAL_ID: - return getDependency_4008OutgoingLinks(view); + return getDependency_Edge_OutgoingLinks(view); case DependencyBranchEditPart.VISUAL_ID: - return getDependency_4018OutgoingLinks(view); + return getDependency_BranchEdge_OutgoingLinks(view); case ElementImportEditPart.VISUAL_ID: - return getElementImport_1064OutgoingLinks(view); + return getElementImport_Edge_OutgoingLinks(view); case PackageImportEditPart.VISUAL_ID: - return getPackageImport_1065OutgoingLinks(view); + return getPackageImport_Edge_OutgoingLinks(view); } } return Collections.emptyList(); } /** - * @generated - */ - public List<UMLLinkDescriptor> getProfile_1000ContainedLinks(View view) { - Profile modelElement = (Profile)view.getElement(); + * @generated + */ + public List<UMLLinkDescriptor> getProfile_ProfileDiagram_ContainedLinks(View view) { + Profile modelElement = (Profile) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Extension_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_2014ContainedLinks(View view) { + public List<UMLLinkDescriptor> getDependency_Shape_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_2015ContainedLinks(View view) { - Association modelElement = (Association)view.getElement(); + public List<UMLLinkDescriptor> getAssociation_Shape_ContainedLinks(View view) { + Association modelElement = (Association) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getStereotype_1026ContainedLinks(View view) { - Stereotype modelElement = (Stereotype)view.getElement(); + public List<UMLLinkDescriptor> getStereotype_Shape_ContainedLinks(View view) { + Stereotype modelElement = (Stereotype) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_2008ContainedLinks(View view) { - Class modelElement = (Class)view.getElement(); + public List<UMLLinkDescriptor> getClass_Shape_ContainedLinks(View view) { + Class modelElement = (Class) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_1031ContainedLinks(View view) { - Class modelElement = (Class)view.getElement(); + public List<UMLLinkDescriptor> getClass_MetaclassShape_ContainedLinks(View view) { + Class modelElement = (Class) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getComment_1002ContainedLinks(View view) { - Comment modelElement = (Comment)view.getElement(); + public List<UMLLinkDescriptor> getComment_Shape_ContainedLinks(View view) { + Comment modelElement = (Comment) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement)); return result; } /** - * @generated - */ - public List<UMLLinkDescriptor> getConstraint_1014ContainedLinks(View view) { - Constraint modelElement = (Constraint)view.getElement(); + * @generated + */ + public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_ContainedLinks(View view) { + Constraint modelElement = (Constraint) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement)); - result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_Context_8500(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getModel_2005ContainedLinks(View view) { - Model modelElement = (Model)view.getElement(); + public List<UMLLinkDescriptor> getModel_Shape_ContainedLinks(View view) { + Model modelElement = (Model) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Extension_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfile_1030ContainedLinks(View view) { - Profile modelElement = (Profile)view.getElement(); + public List<UMLLinkDescriptor> getProfile_Shape_ContainedLinks(View view) { + Profile modelElement = (Profile) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Extension_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPackage_2007ContainedLinks(View view) { - Package modelElement = (Package)view.getElement(); + public List<UMLLinkDescriptor> getPackage_Shape_ContainedLinks(View view) { + Package modelElement = (Package) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Extension_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getEnumeration_2006ContainedLinks(View view) { - Enumeration modelElement = (Enumeration)view.getElement(); + public List<UMLLinkDescriptor> getEnumeration_Shape_ContainedLinks(View view) { + Enumeration modelElement = (Enumeration) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPrimitiveType_2009ContainedLinks(View view) { - PrimitiveType modelElement = (PrimitiveType)view.getElement(); + public List<UMLLinkDescriptor> getPrimitiveType_Shape_ContainedLinks(View view) { + PrimitiveType modelElement = (PrimitiveType) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDataType_2010ContainedLinks(View view) { - DataType modelElement = (DataType)view.getElement(); + public List<UMLLinkDescriptor> getDataType_Shape_ContainedLinks(View view) { + DataType modelElement = (DataType) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDiagram_2016ContainedLinks(View view) { + public List<UMLLinkDescriptor> getDiagram_ShortcutShape_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getPrimitiveType_3026ContainedLinks(View view) { - PrimitiveType modelElement = (PrimitiveType)view.getElement(); + public List<UMLLinkDescriptor> getPrimitiveType_Shape_CN_ContainedLinks(View view) { + PrimitiveType modelElement = (PrimitiveType) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getOperation_3019ContainedLinks(View view) { - Operation modelElement = (Operation)view.getElement(); + public List<UMLLinkDescriptor> getOperation_DataTypeOperationLabel_ContainedLinks(View view) { + Operation modelElement = (Operation) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getEnumerationLiteral_1037ContainedLinks(View view) { + public List<UMLLinkDescriptor> getEnumerationLiteral_LiteralLabel_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getProperty_3018ContainedLinks(View view) { + public List<UMLLinkDescriptor> getProperty_DataTypeAttributeLabel_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getProperty_3002ContainedLinks(View view) { + public List<UMLLinkDescriptor> getProperty_ClassAttributeLabel_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getOperation_3020ContainedLinks(View view) { - Operation modelElement = (Operation)view.getElement(); + public List<UMLLinkDescriptor> getOperation_ClassOperationLabel_ContainedLinks(View view) { + Operation modelElement = (Operation) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getStereotype_1023ContainedLinks(View view) { - Stereotype modelElement = (Stereotype)view.getElement(); + public List<UMLLinkDescriptor> getStereotype_Shape_CN_ContainedLinks(View view) { + Stereotype modelElement = (Stereotype) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_3010ContainedLinks(View view) { - Class modelElement = (Class)view.getElement(); + public List<UMLLinkDescriptor> getClass_Shape_CN_ContainedLinks(View view) { + Class modelElement = (Class) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_3028ContainedLinks(View view) { - Class modelElement = (Class)view.getElement(); + public List<UMLLinkDescriptor> getClass_MetaclassShape_CN_ContainedLinks(View view) { + Class modelElement = (Class) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getComment_1007ContainedLinks(View view) { - Comment modelElement = (Comment)view.getElement(); + public List<UMLLinkDescriptor> getComment_Shape_CN_ContainedLinks(View view) { + Comment modelElement = (Comment) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getModel_1027ContainedLinks(View view) { - Model modelElement = (Model)view.getElement(); + public List<UMLLinkDescriptor> getModel_Shape_CN_ContainedLinks(View view) { + Model modelElement = (Model) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Extension_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfile_1024ContainedLinks(View view) { - Profile modelElement = (Profile)view.getElement(); + public List<UMLLinkDescriptor> getProfile_Shape_CN_ContainedLinks(View view) { + Profile modelElement = (Profile) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Extension_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPackage_1012ContainedLinks(View view) { - Package modelElement = (Package)view.getElement(); + public List<UMLLinkDescriptor> getPackage_Shape_CN_ContainedLinks(View view) { + Package modelElement = (Package) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Extension_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** - * @generated - */ - public List<UMLLinkDescriptor> getConstraint_1028ContainedLinks(View view) { - Constraint modelElement = (Constraint)view.getElement(); + * @generated + */ + public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_CN_ContainedLinks(View view) { + Constraint modelElement = (Constraint) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement)); - result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_Context_8500(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getEnumeration_3025ContainedLinks(View view) { - Enumeration modelElement = (Enumeration)view.getElement(); + public List<UMLLinkDescriptor> getEnumeration_Shape_CN_ContainedLinks(View view) { + Enumeration modelElement = (Enumeration) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDataType_3027ContainedLinks(View view) { - DataType modelElement = (DataType)view.getElement(); + public List<UMLLinkDescriptor> getDataType_Shape_CN_ContainedLinks(View view) { + DataType modelElement = (DataType) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getExtension_1013ContainedLinks(View view) { - Extension modelElement = (Extension)view.getElement(); + public List<UMLLinkDescriptor> getExtension_Edge_ContainedLinks(View view) { + Extension modelElement = (Extension) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_4001ContainedLinks(View view) { - Association modelElement = (Association)view.getElement(); + public List<UMLLinkDescriptor> getAssociation_Edge_ContainedLinks(View view) { + Association modelElement = (Association) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfileApplication_1045ContainedLinks(View view) { + public List<UMLLinkDescriptor> getProfileApplication_Edge_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_4019ContainedLinks(View view) { - Association modelElement = (Association)view.getElement(); + public List<UMLLinkDescriptor> getAssociation_BranchEdge_ContainedLinks(View view) { + Association modelElement = (Association) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getGeneralization_4002ContainedLinks(View view) { + public List<UMLLinkDescriptor> getGeneralization_Edge_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_4008ContainedLinks(View view) { + public List<UMLLinkDescriptor> getDependency_Edge_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_4018ContainedLinks(View view) { + public List<UMLLinkDescriptor> getDependency_BranchEdge_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getElementImport_1064ContainedLinks(View view) { + public List<UMLLinkDescriptor> getElementImport_Edge_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getPackageImport_1065ContainedLinks(View view) { + public List<UMLLinkDescriptor> getPackageImport_Edge_ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_2014IncomingLinks(View view) { - Dependency modelElement = (Dependency)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getDependency_Shape_IncomingLinks(View view) { + Dependency modelElement = (Dependency) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_2015IncomingLinks(View view) { - Association modelElement = (Association)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getAssociation_Shape_IncomingLinks(View view) { + Association modelElement = (Association) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getStereotype_1026IncomingLinks(View view) { - Stereotype modelElement = (Stereotype)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getStereotype_Shape_IncomingLinks(View view) { + Stereotype modelElement = (Stereotype) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Extension_1013(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Extension_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_2008IncomingLinks(View view) { - Class modelElement = (Class)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getClass_Shape_IncomingLinks(View view) { + Class modelElement = (Class) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Extension_1013(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Extension_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_1031IncomingLinks(View view) { - Class modelElement = (Class)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getClass_MetaclassShape_IncomingLinks(View view) { + Class modelElement = (Class) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Extension_1013(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Extension_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getComment_1002IncomingLinks(View view) { - Comment modelElement = (Comment)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getComment_Shape_IncomingLinks(View view) { + Comment modelElement = (Comment) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** - * @generated - */ - public List<UMLLinkDescriptor> getConstraint_1014IncomingLinks(View view) { - Constraint modelElement = (Constraint)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + * @generated + */ + public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_IncomingLinks(View view) { + Constraint modelElement = (Constraint) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getModel_2005IncomingLinks(View view) { - Model modelElement = (Model)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getModel_Shape_IncomingLinks(View view) { + Model modelElement = (Model) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_PackageImport_1065(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfile_1030IncomingLinks(View view) { - Profile modelElement = (Profile)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getProfile_Shape_IncomingLinks(View view) { + Profile modelElement = (Profile) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_ProfileApplication_1045(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_PackageImport_1065(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ProfileApplication_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPackage_2007IncomingLinks(View view) { - Package modelElement = (Package)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getPackage_Shape_IncomingLinks(View view) { + Package modelElement = (Package) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_PackageImport_1065(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getEnumeration_2006IncomingLinks(View view) { - Enumeration modelElement = (Enumeration)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getEnumeration_Shape_IncomingLinks(View view) { + Enumeration modelElement = (Enumeration) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPrimitiveType_2009IncomingLinks(View view) { - PrimitiveType modelElement = (PrimitiveType)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getPrimitiveType_Shape_IncomingLinks(View view) { + PrimitiveType modelElement = (PrimitiveType) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDataType_2010IncomingLinks(View view) { - DataType modelElement = (DataType)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getDataType_Shape_IncomingLinks(View view) { + DataType modelElement = (DataType) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDiagram_2016IncomingLinks(View view) { + public List<UMLLinkDescriptor> getDiagram_ShortcutShape_IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getPrimitiveType_3026IncomingLinks(View view) { - PrimitiveType modelElement = (PrimitiveType)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getPrimitiveType_Shape_CN_IncomingLinks(View view) { + PrimitiveType modelElement = (PrimitiveType) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getOperation_3019IncomingLinks(View view) { + public List<UMLLinkDescriptor> getOperation_DataTypeOperationLabel_IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getEnumerationLiteral_1037IncomingLinks(View view) { + public List<UMLLinkDescriptor> getEnumerationLiteral_LiteralLabel_IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getProperty_3018IncomingLinks(View view) { + public List<UMLLinkDescriptor> getProperty_DataTypeAttributeLabel_IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getProperty_3002IncomingLinks(View view) { + public List<UMLLinkDescriptor> getProperty_ClassAttributeLabel_IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getOperation_3020IncomingLinks(View view) { + public List<UMLLinkDescriptor> getOperation_ClassOperationLabel_IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getStereotype_1023IncomingLinks(View view) { - Stereotype modelElement = (Stereotype)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getStereotype_Shape_CN_IncomingLinks(View view) { + Stereotype modelElement = (Stereotype) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Extension_1013(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Extension_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_3010IncomingLinks(View view) { - Class modelElement = (Class)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getClass_Shape_CN_IncomingLinks(View view) { + Class modelElement = (Class) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Extension_1013(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Extension_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_3028IncomingLinks(View view) { - Class modelElement = (Class)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getClass_MetaclassShape_CN_IncomingLinks(View view) { + Class modelElement = (Class) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Extension_1013(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Extension_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getComment_1007IncomingLinks(View view) { - Comment modelElement = (Comment)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getComment_Shape_CN_IncomingLinks(View view) { + Comment modelElement = (Comment) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getModel_1027IncomingLinks(View view) { - Model modelElement = (Model)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getModel_Shape_CN_IncomingLinks(View view) { + Model modelElement = (Model) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_PackageImport_1065(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfile_1024IncomingLinks(View view) { - Profile modelElement = (Profile)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getProfile_Shape_CN_IncomingLinks(View view) { + Profile modelElement = (Profile) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_ProfileApplication_1045(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_PackageImport_1065(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ProfileApplication_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPackage_1012IncomingLinks(View view) { - Package modelElement = (Package)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getPackage_Shape_CN_IncomingLinks(View view) { + Package modelElement = (Package) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_PackageImport_1065(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** - * @generated - */ - public List<UMLLinkDescriptor> getConstraint_1028IncomingLinks(View view) { - Constraint modelElement = (Constraint)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + * @generated + */ + public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_CN_IncomingLinks(View view) { + Constraint modelElement = (Constraint) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getEnumeration_3025IncomingLinks(View view) { - Enumeration modelElement = (Enumeration)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getEnumeration_Shape_CN_IncomingLinks(View view) { + Enumeration modelElement = (Enumeration) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDataType_3027IncomingLinks(View view) { - DataType modelElement = (DataType)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getDataType_Shape_CN_IncomingLinks(View view) { + DataType modelElement = (DataType) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getExtension_1013IncomingLinks(View view) { - Extension modelElement = (Extension)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getExtension_Edge_IncomingLinks(View view) { + Extension modelElement = (Extension) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_4001IncomingLinks(View view) { - Association modelElement = (Association)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getAssociation_Edge_IncomingLinks(View view) { + Association modelElement = (Association) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfileApplication_1045IncomingLinks(View view) { - ProfileApplication modelElement = (ProfileApplication)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getProfileApplication_Edge_IncomingLinks(View view) { + ProfileApplication modelElement = (ProfileApplication) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_4019IncomingLinks(View view) { - Association modelElement = (Association)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getAssociation_BranchEdge_IncomingLinks(View view) { + Association modelElement = (Association) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Association_4001(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Association_4019(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Generalization_4002(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_Context_8500(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Generalization_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getGeneralization_4002IncomingLinks(View view) { - Generalization modelElement = (Generalization)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getGeneralization_Edge_IncomingLinks(View view) { + Generalization modelElement = (Generalization) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_4008IncomingLinks(View view) { - Dependency modelElement = (Dependency)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getDependency_Edge_IncomingLinks(View view) { + Dependency modelElement = (Dependency) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_4018IncomingLinks(View view) { - Dependency modelElement = (Dependency)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getDependency_BranchEdge_IncomingLinks(View view) { + Dependency modelElement = (Dependency) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4008(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_Dependency_4018(modelElement, crossReferencer)); - result.addAll(getIncomingTypeModelFacetLinks_ElementImport_1064(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); + result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getElementImport_1064IncomingLinks(View view) { - ElementImport modelElement = (ElementImport)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getElementImport_Edge_IncomingLinks(View view) { + ElementImport modelElement = (ElementImport) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPackageImport_1065IncomingLinks(View view) { - PackageImport modelElement = (PackageImport)view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + public List<UMLLinkDescriptor> getPackageImport_Edge_IncomingLinks(View view) { + PackageImport modelElement = (PackageImport) view.getElement(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter + .getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement, crossReferencer)); - result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); + result.addAll( + getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_2014OutgoingLinks(View view) { - Dependency modelElement = (Dependency)view.getElement(); + public List<UMLLinkDescriptor> getDependency_Shape_OutgoingLinks(View view) { + Dependency modelElement = (Dependency) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_2015OutgoingLinks(View view) { - Association modelElement = (Association)view.getElement(); + public List<UMLLinkDescriptor> getAssociation_Shape_OutgoingLinks(View view) { + Association modelElement = (Association) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getStereotype_1026OutgoingLinks(View view) { - Stereotype modelElement = (Stereotype)view.getElement(); + public List<UMLLinkDescriptor> getStereotype_Shape_OutgoingLinks(View view) { + Stereotype modelElement = (Stereotype) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_2008OutgoingLinks(View view) { - Class modelElement = (Class)view.getElement(); + public List<UMLLinkDescriptor> getClass_Shape_OutgoingLinks(View view) { + Class modelElement = (Class) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_1031OutgoingLinks(View view) { - Class modelElement = (Class)view.getElement(); + public List<UMLLinkDescriptor> getClass_MetaclassShape_OutgoingLinks(View view) { + Class modelElement = (Class) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getComment_1002OutgoingLinks(View view) { - Comment modelElement = (Comment)view.getElement(); + public List<UMLLinkDescriptor> getComment_Shape_OutgoingLinks(View view) { + Comment modelElement = (Comment) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement)); return result; } /** - * @generated - */ - public List<UMLLinkDescriptor> getConstraint_1014OutgoingLinks(View view) { - Constraint modelElement = (Constraint)view.getElement(); + * @generated + */ + public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_OutgoingLinks(View view) { + Constraint modelElement = (Constraint) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement)); - result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_Context_8500(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getModel_2005OutgoingLinks(View view) { - Model modelElement = (Model)view.getElement(); + public List<UMLLinkDescriptor> getModel_Shape_OutgoingLinks(View view) { + Model modelElement = (Model) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfile_1030OutgoingLinks(View view) { - Profile modelElement = (Profile)view.getElement(); + public List<UMLLinkDescriptor> getProfile_Shape_OutgoingLinks(View view) { + Profile modelElement = (Profile) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPackage_2007OutgoingLinks(View view) { - Package modelElement = (Package)view.getElement(); + public List<UMLLinkDescriptor> getPackage_Shape_OutgoingLinks(View view) { + Package modelElement = (Package) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getEnumeration_2006OutgoingLinks(View view) { - Enumeration modelElement = (Enumeration)view.getElement(); + public List<UMLLinkDescriptor> getEnumeration_Shape_OutgoingLinks(View view) { + Enumeration modelElement = (Enumeration) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPrimitiveType_2009OutgoingLinks(View view) { - PrimitiveType modelElement = (PrimitiveType)view.getElement(); + public List<UMLLinkDescriptor> getPrimitiveType_Shape_OutgoingLinks(View view) { + PrimitiveType modelElement = (PrimitiveType) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDataType_2010OutgoingLinks(View view) { - DataType modelElement = (DataType)view.getElement(); + public List<UMLLinkDescriptor> getDataType_Shape_OutgoingLinks(View view) { + DataType modelElement = (DataType) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDiagram_2016OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getDiagram_ShortcutShape_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getPrimitiveType_3026OutgoingLinks(View view) { - PrimitiveType modelElement = (PrimitiveType)view.getElement(); + public List<UMLLinkDescriptor> getPrimitiveType_Shape_CN_OutgoingLinks(View view) { + PrimitiveType modelElement = (PrimitiveType) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getOperation_3019OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getOperation_DataTypeOperationLabel_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getEnumerationLiteral_1037OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getEnumerationLiteral_LiteralLabel_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getProperty_3018OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getProperty_DataTypeAttributeLabel_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getProperty_3002OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getProperty_ClassAttributeLabel_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getOperation_3020OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getOperation_ClassOperationLabel_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getStereotype_1023OutgoingLinks(View view) { - Stereotype modelElement = (Stereotype)view.getElement(); + public List<UMLLinkDescriptor> getStereotype_Shape_CN_OutgoingLinks(View view) { + Stereotype modelElement = (Stereotype) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_3010OutgoingLinks(View view) { - Class modelElement = (Class)view.getElement(); + public List<UMLLinkDescriptor> getClass_Shape_CN_OutgoingLinks(View view) { + Class modelElement = (Class) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getClass_3028OutgoingLinks(View view) { - Class modelElement = (Class)view.getElement(); + public List<UMLLinkDescriptor> getClass_MetaclassShape_CN_OutgoingLinks(View view) { + Class modelElement = (Class) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getComment_1007OutgoingLinks(View view) { - Comment modelElement = (Comment)view.getElement(); + public List<UMLLinkDescriptor> getComment_Shape_CN_OutgoingLinks(View view) { + Comment modelElement = (Comment) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getModel_1027OutgoingLinks(View view) { - Model modelElement = (Model)view.getElement(); + public List<UMLLinkDescriptor> getModel_Shape_CN_OutgoingLinks(View view) { + Model modelElement = (Model) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfile_1024OutgoingLinks(View view) { - Profile modelElement = (Profile)view.getElement(); + public List<UMLLinkDescriptor> getProfile_Shape_CN_OutgoingLinks(View view) { + Profile modelElement = (Profile) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getPackage_1012OutgoingLinks(View view) { - Package modelElement = (Package)view.getElement(); + public List<UMLLinkDescriptor> getPackage_Shape_CN_OutgoingLinks(View view) { + Package modelElement = (Package) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** - * @generated - */ - public List<UMLLinkDescriptor> getConstraint_1028OutgoingLinks(View view) { - Constraint modelElement = (Constraint)view.getElement(); + * @generated + */ + public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_CN_OutgoingLinks(View view) { + Constraint modelElement = (Constraint) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement)); - result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_Context_8500(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement)); + result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getEnumeration_3025OutgoingLinks(View view) { - Enumeration modelElement = (Enumeration)view.getElement(); + public List<UMLLinkDescriptor> getEnumeration_Shape_CN_OutgoingLinks(View view) { + Enumeration modelElement = (Enumeration) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDataType_3027OutgoingLinks(View view) { - DataType modelElement = (DataType)view.getElement(); + public List<UMLLinkDescriptor> getDataType_Shape_CN_OutgoingLinks(View view) { + DataType modelElement = (DataType) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getExtension_1013OutgoingLinks(View view) { - Extension modelElement = (Extension)view.getElement(); + public List<UMLLinkDescriptor> getExtension_Edge_OutgoingLinks(View view) { + Extension modelElement = (Extension) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_4001OutgoingLinks(View view) { - Association modelElement = (Association)view.getElement(); + public List<UMLLinkDescriptor> getAssociation_Edge_OutgoingLinks(View view) { + Association modelElement = (Association) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getProfileApplication_1045OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getProfileApplication_Edge_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getAssociation_4019OutgoingLinks(View view) { - Association modelElement = (Association)view.getElement(); + public List<UMLLinkDescriptor> getAssociation_BranchEdge_OutgoingLinks(View view) { + Association modelElement = (Association) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Association_4019(modelElement)); - result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_1064(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_1065(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); + result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_ElementImport_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getGeneralization_4002OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getGeneralization_Edge_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_4008OutgoingLinks(View view) { - Dependency modelElement = (Dependency)view.getElement(); + public List<UMLLinkDescriptor> getDependency_Edge_OutgoingLinks(View view) { + Dependency modelElement = (Dependency) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getDependency_4018OutgoingLinks(View view) { - Dependency modelElement = (Dependency)view.getElement(); + public List<UMLLinkDescriptor> getDependency_BranchEdge_OutgoingLinks(View view) { + Dependency modelElement = (Dependency) view.getElement(); LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); - result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4018(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_Edge(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(modelElement)); return result; } /** * @generated */ - public List<UMLLinkDescriptor> getElementImport_1064OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getElementImport_Edge_OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public List<UMLLinkDescriptor> getPackageImport_1065OutgoingLinks(View view) { + public List<UMLLinkDescriptor> getPackageImport_Edge_OutgoingLinks(View view) { return Collections.emptyList(); } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Extension_1013(Package container) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Extension_Edge(Package container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Extension) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Extension) { continue; } - Extension link = (Extension)linkObject; - if(!ExtensionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Extension link = (Extension) linkObject; + if (!ExtensionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Class dst = link.getMetaclass(); List<?> sources = link.getOwnedEnds(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof Property) { + if (false == theSource instanceof Property) { continue; } - Property src = (Property)theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Extension_1013, ExtensionEditPart.VISUAL_ID)); + Property src = (Property) theSource; + result.add( + new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Extension_Edge, ExtensionEditPart.VISUAL_ID)); } return result; } @@ -2883,30 +2950,31 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_4001(Package container) { + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_Edge(Package container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Association) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Association) { continue; } - Association link = (Association)linkObject; - if(!AssociationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Association link = (Association) linkObject; + if (!AssociationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getEndTypes(); Object theTarget = targets.size() == 1 ? targets.get(0) : null; - if(false == theTarget instanceof Type) { + if (false == theTarget instanceof Type) { continue; } - Type dst = (Type)theTarget; + Type dst = (Type) theTarget; List<?> sources = link.getEndTypes(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof Type) { + if (false == theSource instanceof Type) { continue; } - Type src = (Type)theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_4001, AssociationEditPart.VISUAL_ID)); + Type src = (Type) theSource; + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_Edge, + AssociationEditPart.VISUAL_ID)); } return result; } @@ -2914,20 +2982,21 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ProfileApplication_1045(Package container) { + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ProfileApplication_Edge(Package container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getProfileApplications().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof ProfileApplication) { + for (Iterator<?> links = container.getProfileApplications().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof ProfileApplication) { continue; } - ProfileApplication link = (ProfileApplication)linkObject; - if(!ProfileApplicationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + ProfileApplication link = (ProfileApplication) linkObject; + if (!ProfileApplicationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Profile dst = link.getAppliedProfile(); Package src = link.getApplyingPackage(); - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ProfileApplication_1045, ProfileApplicationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ProfileApplication_Edge, + ProfileApplicationEditPart.VISUAL_ID)); } return result; } @@ -2935,30 +3004,31 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_4019(Package container) { + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_BranchEdge(Package container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Association) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Association) { continue; } - Association link = (Association)linkObject; - if(!AssociationBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Association link = (Association) linkObject; + if (!AssociationBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getEndTypes(); Object theTarget = targets.size() == 1 ? targets.get(0) : null; - if(false == theTarget instanceof Type) { + if (false == theTarget instanceof Type) { continue; } - Type dst = (Type)theTarget; + Type dst = (Type) theTarget; List<?> sources = link.getEndTypes(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof Type) { + if (false == theSource instanceof Type) { continue; } - Type src = (Type)theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_4019, AssociationBranchEditPart.VISUAL_ID)); + Type src = (Type) theSource; + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_BranchEdge, + AssociationBranchEditPart.VISUAL_ID)); } return result; } @@ -2966,19 +3036,20 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_4002(Classifier container) { + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_Edge(Classifier container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Generalization) { + for (Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Generalization) { continue; } - Generalization link = (Generalization)linkObject; - if(!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Generalization link = (Generalization) linkObject; + if (!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Classifier dst = link.getGeneral(); - result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_4002, GeneralizationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_Edge, + GeneralizationEditPart.VISUAL_ID)); } return result; } @@ -2986,30 +3057,31 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4008(Package container) { + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_Edge(Package container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Dependency) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Dependency) { continue; } - Dependency link = (Dependency)linkObject; - if(!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Dependency link = (Dependency) linkObject; + if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getSuppliers(); Object theTarget = targets.size() == 1 ? targets.get(0) : null; - if(false == theTarget instanceof NamedElement) { + if (false == theTarget instanceof NamedElement) { continue; } - NamedElement dst = (NamedElement)theTarget; + NamedElement dst = (NamedElement) theTarget; List<?> sources = link.getClients(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof NamedElement) { + if (false == theSource instanceof NamedElement) { continue; } - NamedElement src = (NamedElement)theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4008, DependencyEditPart.VISUAL_ID)); + NamedElement src = (NamedElement) theSource; + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, + DependencyEditPart.VISUAL_ID)); } return result; } @@ -3017,30 +3089,31 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4018(Package container) { + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_BranchEdge(Package container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Dependency) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Dependency) { continue; } - Dependency link = (Dependency)linkObject; - if(!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Dependency link = (Dependency) linkObject; + if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getSuppliers(); Object theTarget = targets.size() == 1 ? targets.get(0) : null; - if(false == theTarget instanceof NamedElement) { + if (false == theTarget instanceof NamedElement) { continue; } - NamedElement dst = (NamedElement)theTarget; + NamedElement dst = (NamedElement) theTarget; List<?> sources = link.getClients(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof NamedElement) { + if (false == theSource instanceof NamedElement) { continue; } - NamedElement src = (NamedElement)theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4018, DependencyBranchEditPart.VISUAL_ID)); + NamedElement src = (NamedElement) theSource; + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge, + DependencyBranchEditPart.VISUAL_ID)); } return result; } @@ -3048,20 +3121,21 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ElementImport_1064(Namespace container) { + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ElementImport_Edge(Namespace container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getElementImports().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof ElementImport) { + for (Iterator<?> links = container.getElementImports().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof ElementImport) { continue; } - ElementImport link = (ElementImport)linkObject; - if(!ElementImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + ElementImport link = (ElementImport) linkObject; + if (!ElementImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } PackageableElement dst = link.getImportedElement(); Namespace src = link.getImportingNamespace(); - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ElementImport_1064, ElementImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ElementImport_Edge, + ElementImportEditPart.VISUAL_ID)); } return result; } @@ -3069,269 +3143,305 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_PackageImport_1065(Namespace container) { + protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_PackageImport_Edge(Namespace container) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackageImports().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof PackageImport) { + for (Iterator<?> links = container.getPackageImports().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof PackageImport) { continue; } - PackageImport link = (PackageImport)linkObject; - if(!PackageImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + PackageImport link = (PackageImport) linkObject; + if (!PackageImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Package dst = link.getImportedPackage(); Namespace src = link.getImportingNamespace(); - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageImport_1065, PackageImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageImport_Edge, + PackageImportEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Extension_1013(Class target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Extension_Edge(Class target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getExtension_Metaclass() || false == setting.getEObject() instanceof Extension) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getExtension_Metaclass() + || false == setting.getEObject() instanceof Extension) { continue; } - Extension link = (Extension)setting.getEObject(); - if(!ExtensionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Extension link = (Extension) setting.getEObject(); + if (!ExtensionEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> sources = link.getOwnedEnds(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof Property) { + if (false == theSource instanceof Property) { continue; } - Property src = (Property)theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Extension_1013, ExtensionEditPart.VISUAL_ID)); + Property src = (Property) theSource; + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Extension_Edge, + ExtensionEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_4001(Type target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_Edge(Type target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() + || false == setting.getEObject() instanceof Association) { continue; } - Association link = (Association)setting.getEObject(); - if(!AssociationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Association link = (Association) setting.getEObject(); + if (!AssociationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> sources = link.getEndTypes(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof Type) { + if (false == theSource instanceof Type) { continue; } - Type src = (Type)theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_4001, AssociationEditPart.VISUAL_ID)); + Type src = (Type) theSource; + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_Edge, + AssociationEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ProfileApplication_1045(Profile target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ProfileApplication_Edge(Profile target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getProfileApplication_AppliedProfile() || false == setting.getEObject() instanceof ProfileApplication) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getProfileApplication_AppliedProfile() + || false == setting.getEObject() instanceof ProfileApplication) { continue; } - ProfileApplication link = (ProfileApplication)setting.getEObject(); - if(!ProfileApplicationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + ProfileApplication link = (ProfileApplication) setting.getEObject(); + if (!ProfileApplicationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Package src = link.getApplyingPackage(); - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ProfileApplication_1045, ProfileApplicationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ProfileApplication_Edge, + ProfileApplicationEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_4019(Type target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_BranchEdge(Type target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() + || false == setting.getEObject() instanceof Association) { continue; } - Association link = (Association)setting.getEObject(); - if(!AssociationBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Association link = (Association) setting.getEObject(); + if (!AssociationBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> sources = link.getEndTypes(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof Type) { + if (false == theSource instanceof Type) { continue; } - Type src = (Type)theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_4019, AssociationBranchEditPart.VISUAL_ID)); + Type src = (Type) theSource; + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_BranchEdge, + AssociationBranchEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_4002(Classifier target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_Edge(Classifier target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() + || false == setting.getEObject() instanceof Generalization) { continue; } - Generalization link = (Generalization)setting.getEObject(); - if(!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Generalization link = (Generalization) setting.getEObject(); + if (!GeneralizationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } - if(false == link.eContainer() instanceof Classifier) { + if (false == link.eContainer() instanceof Classifier) { continue; } - Classifier container = (Classifier)link.eContainer(); - result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.Generalization_4002, GeneralizationEditPart.VISUAL_ID)); + Classifier container = (Classifier) link.eContainer(); + result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.Generalization_Edge, + GeneralizationEditPart.VISUAL_ID)); + } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4008(NamedElement target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_Edge(NamedElement target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() + || false == setting.getEObject() instanceof Dependency) { continue; } - Dependency link = (Dependency)setting.getEObject(); - if(!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Dependency link = (Dependency) setting.getEObject(); + if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> sources = link.getClients(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof NamedElement) { + if (false == theSource instanceof NamedElement) { continue; } - NamedElement src = (NamedElement)theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4008, DependencyEditPart.VISUAL_ID)); + NamedElement src = (NamedElement) theSource; + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge, + DependencyEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4018(NamedElement target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_BranchEdge(NamedElement target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() + || false == setting.getEObject() instanceof Dependency) { continue; } - Dependency link = (Dependency)setting.getEObject(); - if(!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Dependency link = (Dependency) setting.getEObject(); + if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> sources = link.getClients(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof NamedElement) { + if (false == theSource instanceof NamedElement) { continue; } - NamedElement src = (NamedElement)theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4018, DependencyBranchEditPart.VISUAL_ID)); + NamedElement src = (NamedElement) theSource; + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_BranchEdge, + DependencyBranchEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ElementImport_1064(PackageableElement target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ElementImport_Edge(PackageableElement target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getElementImport_ImportedElement() || false == setting.getEObject() instanceof ElementImport) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getElementImport_ImportedElement() + || false == setting.getEObject() instanceof ElementImport) { continue; } - ElementImport link = (ElementImport)setting.getEObject(); - if(!ElementImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + ElementImport link = (ElementImport) setting.getEObject(); + if (!ElementImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Namespace src = link.getImportingNamespace(); - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ElementImport_1064, ElementImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ElementImport_Edge, + ElementImportEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_PackageImport_1065(Package target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_PackageImport_Edge(Package target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getPackageImport_ImportedPackage() || false == setting.getEObject() instanceof PackageImport) { + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getPackageImport_ImportedPackage() + || false == setting.getEObject() instanceof PackageImport) { continue; } - PackageImport link = (PackageImport)setting.getEObject(); - if(!PackageImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + PackageImport link = (PackageImport) setting.getEObject(); + if (!PackageImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Namespace src = link.getImportingNamespace(); - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.PackageImport_1065, PackageImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.PackageImport_Edge, + PackageImportEditPart.VISUAL_ID)); } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(Element target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge( + Element target, CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) { - result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_1022, CommentAnnotatedElementEditPart.VISUAL_ID)); + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) { + result.add(new UMLLinkDescriptor(setting.getEObject(), target, + UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID)); } } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Element target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge( + Element target, CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) { - result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID)); + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) { + result.add(new UMLLinkDescriptor(setting.getEObject(), target, + UMLElementTypes.Constraint_ConstrainedElementEdge, + ConstraintConstrainedElementEditPart.VISUAL_ID)); } } return result; } /** - * @generated - */ - protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_Context_8500(Namespace target, CrossReferenceAdapter crossReferencer) { + * @generated + */ + protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(Namespace target, + CrossReferenceAdapter crossReferencer) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); - for(EStructuralFeature.Setting setting : settings) { - if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_Context()) { - result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintContext_8500, ContextLinkEditPart.VISUAL_ID)); + for (EStructuralFeature.Setting setting : settings) { + if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_Context()) { + result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ContextEdge, + ContextLinkEditPart.VISUAL_ID)); } } return result; @@ -3340,45 +3450,46 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_4001(Type source) { + protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_Edge(Type source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source // and return the first element that is instance of the container class. - for(EObject element = source; element != null && container == null; element = element.eContainer()) { - if(element instanceof Package) { - container = (Package)element; + for (EObject element = source; element != null && container == null; element = element.eContainer()) { + if (element instanceof Package) { + container = (Package) element; } } - if(container == null) { + if (container == null) { return Collections.emptyList(); } LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Association) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Association) { continue; } - Association link = (Association)linkObject; - if(!AssociationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Association link = (Association) linkObject; + if (!AssociationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getEndTypes(); Object theTarget = targets.size() == 1 ? targets.get(0) : null; - if(false == theTarget instanceof Type) { + if (false == theTarget instanceof Type) { continue; } - Type dst = (Type)theTarget; + Type dst = (Type) theTarget; List<?> sources = link.getEndTypes(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof Type) { + if (false == theSource instanceof Type) { continue; } - Type src = (Type)theSource; - if(src != source) { + Type src = (Type) theSource; + if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_4001, AssociationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_Edge, + AssociationEditPart.VISUAL_ID)); } return result; } @@ -3386,35 +3497,36 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ProfileApplication_1045(Package source) { + protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ProfileApplication_Edge(Package source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source // and return the first element that is instance of the container class. - for(EObject element = source; element != null && container == null; element = element.eContainer()) { - if(element instanceof Package) { - container = (Package)element; + for (EObject element = source; element != null && container == null; element = element.eContainer()) { + if (element instanceof Package) { + container = (Package) element; } } - if(container == null) { + if (container == null) { return Collections.emptyList(); } LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getProfileApplications().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof ProfileApplication) { + for (Iterator<?> links = container.getProfileApplications().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof ProfileApplication) { continue; } - ProfileApplication link = (ProfileApplication)linkObject; - if(!ProfileApplicationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + ProfileApplication link = (ProfileApplication) linkObject; + if (!ProfileApplicationEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Profile dst = link.getAppliedProfile(); Package src = link.getApplyingPackage(); - if(src != source) { + if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ProfileApplication_1045, ProfileApplicationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ProfileApplication_Edge, + ProfileApplicationEditPart.VISUAL_ID)); } return result; } @@ -3422,45 +3534,46 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_4019(Type source) { + protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_BranchEdge(Type source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source // and return the first element that is instance of the container class. - for(EObject element = source; element != null && container == null; element = element.eContainer()) { - if(element instanceof Package) { - container = (Package)element; + for (EObject element = source; element != null && container == null; element = element.eContainer()) { + if (element instanceof Package) { + container = (Package) element; } } - if(container == null) { + if (container == null) { return Collections.emptyList(); } LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Association) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Association) { continue; } - Association link = (Association)linkObject; - if(!AssociationBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Association link = (Association) linkObject; + if (!AssociationBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getEndTypes(); Object theTarget = targets.size() == 1 ? targets.get(0) : null; - if(false == theTarget instanceof Type) { + if (false == theTarget instanceof Type) { continue; } - Type dst = (Type)theTarget; + Type dst = (Type) theTarget; List<?> sources = link.getEndTypes(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof Type) { + if (false == theSource instanceof Type) { continue; } - Type src = (Type)theSource; - if(src != source) { + Type src = (Type) theSource; + if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_4019, AssociationBranchEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_BranchEdge, + AssociationBranchEditPart.VISUAL_ID)); } return result; } @@ -3468,45 +3581,46 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_4008(NamedElement source) { + protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_Edge(NamedElement source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source // and return the first element that is instance of the container class. - for(EObject element = source; element != null && container == null; element = element.eContainer()) { - if(element instanceof Package) { - container = (Package)element; + for (EObject element = source; element != null && container == null; element = element.eContainer()) { + if (element instanceof Package) { + container = (Package) element; } } - if(container == null) { + if (container == null) { return Collections.emptyList(); } LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Dependency) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Dependency) { continue; } - Dependency link = (Dependency)linkObject; - if(!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Dependency link = (Dependency) linkObject; + if (!DependencyEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getSuppliers(); Object theTarget = targets.size() == 1 ? targets.get(0) : null; - if(false == theTarget instanceof NamedElement) { + if (false == theTarget instanceof NamedElement) { continue; } - NamedElement dst = (NamedElement)theTarget; + NamedElement dst = (NamedElement) theTarget; List<?> sources = link.getClients(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof NamedElement) { + if (false == theSource instanceof NamedElement) { continue; } - NamedElement src = (NamedElement)theSource; - if(src != source) { + NamedElement src = (NamedElement) theSource; + if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4008, DependencyEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, + DependencyEditPart.VISUAL_ID)); } return result; } @@ -3514,45 +3628,46 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_4018(NamedElement source) { + protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_BranchEdge(NamedElement source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source // and return the first element that is instance of the container class. - for(EObject element = source; element != null && container == null; element = element.eContainer()) { - if(element instanceof Package) { - container = (Package)element; + for (EObject element = source; element != null && container == null; element = element.eContainer()) { + if (element instanceof Package) { + container = (Package) element; } } - if(container == null) { + if (container == null) { return Collections.emptyList(); } LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof Dependency) { + for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof Dependency) { continue; } - Dependency link = (Dependency)linkObject; - if(!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + Dependency link = (Dependency) linkObject; + if (!DependencyBranchEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getSuppliers(); Object theTarget = targets.size() == 1 ? targets.get(0) : null; - if(false == theTarget instanceof NamedElement) { + if (false == theTarget instanceof NamedElement) { continue; } - NamedElement dst = (NamedElement)theTarget; + NamedElement dst = (NamedElement) theTarget; List<?> sources = link.getClients(); Object theSource = sources.size() == 1 ? sources.get(0) : null; - if(false == theSource instanceof NamedElement) { + if (false == theSource instanceof NamedElement) { continue; } - NamedElement src = (NamedElement)theSource; - if(src != source) { + NamedElement src = (NamedElement) theSource; + if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4018, DependencyBranchEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge, + DependencyBranchEditPart.VISUAL_ID)); } return result; } @@ -3560,35 +3675,36 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ElementImport_1064(Namespace source) { + protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ElementImport_Edge(Namespace source) { Namespace container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source // and return the first element that is instance of the container class. - for(EObject element = source; element != null && container == null; element = element.eContainer()) { - if(element instanceof Namespace) { - container = (Namespace)element; + for (EObject element = source; element != null && container == null; element = element.eContainer()) { + if (element instanceof Namespace) { + container = (Namespace) element; } } - if(container == null) { + if (container == null) { return Collections.emptyList(); } LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getElementImports().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof ElementImport) { + for (Iterator<?> links = container.getElementImports().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof ElementImport) { continue; } - ElementImport link = (ElementImport)linkObject; - if(!ElementImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + ElementImport link = (ElementImport) linkObject; + if (!ElementImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } PackageableElement dst = link.getImportedElement(); Namespace src = link.getImportingNamespace(); - if(src != source) { + if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ElementImport_1064, ElementImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ElementImport_Edge, + ElementImportEditPart.VISUAL_ID)); } return result; } @@ -3596,35 +3712,36 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_PackageImport_1065(Namespace source) { + protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_PackageImport_Edge(Namespace source) { Namespace container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source // and return the first element that is instance of the container class. - for(EObject element = source; element != null && container == null; element = element.eContainer()) { - if(element instanceof Namespace) { - container = (Namespace)element; + for (EObject element = source; element != null && container == null; element = element.eContainer()) { + if (element instanceof Namespace) { + container = (Namespace) element; } } - if(container == null) { + if (container == null) { return Collections.emptyList(); } LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> links = container.getPackageImports().iterator(); links.hasNext();) { - EObject linkObject = (EObject)links.next(); - if(false == linkObject instanceof PackageImport) { + for (Iterator<?> links = container.getPackageImports().iterator(); links.hasNext();) { + EObject linkObject = (EObject) links.next(); + if (false == linkObject instanceof PackageImport) { continue; } - PackageImport link = (PackageImport)linkObject; - if(!PackageImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + PackageImport link = (PackageImport) linkObject; + if (!PackageImportEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } Package dst = link.getImportedPackage(); Namespace src = link.getImportingNamespace(); - if(src != source) { + if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageImport_1065, PackageImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageImport_Edge, + PackageImportEditPart.VISUAL_ID)); } return result; } @@ -3632,11 +3749,13 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(Comment source) { + protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge( + Comment source) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) { - Element destination = (Element)destinations.next(); - result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_1022, CommentAnnotatedElementEditPart.VISUAL_ID)); + for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) { + Element destination = (Element) destinations.next(); + result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, + CommentAnnotatedElementEditPart.VISUAL_ID)); } return result; } @@ -3644,11 +3763,13 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Constraint source) { + protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge( + Constraint source) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for(Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) { - Element destination = (Element)destinations.next(); - result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID)); + for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) { + Element destination = (Element) destinations.next(); + result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, + ConstraintConstrainedElementEditPart.VISUAL_ID)); } return result; } @@ -3656,13 +3777,15 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ - protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_Context_8500(Constraint source) { + protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge( + Constraint source) { LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); Namespace destination = source.getContext(); - if(destination == null) { + if (destination == null) { return result; } - result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintContext_8500, ContextLinkEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ContextEdge, + ContextLinkEditPart.VISUAL_ID)); return result; } } 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 fb09d8a336b..1f49d557228 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 @@ -75,12 +75,16 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ @Override protected ElementInfo createElementInfo(Object element) throws CoreException { - if(false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) { - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ - null)); + if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) { + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, + NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ + "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + null)); } - IEditorInput editorInput = (IEditorInput)element; - IDiagramDocument document = (IDiagramDocument)createDocument(editorInput); + IEditorInput editorInput = (IEditorInput) element; + IDiagramDocument document = (IDiagramDocument) createDocument(editorInput); + ResourceSetInfo info = new ResourceSetInfo(document, editorInput); info.setModificationStamp(computeModificationStamp(info)); info.fStatus = null; @@ -92,12 +96,15 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ @Override protected IDocument createDocument(Object element) throws CoreException { - if(false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) { - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ - null)); + if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) { + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, + NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ + "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + null)); } IDocument document = createEmptyDocument(); - setDocumentContent(document, (IEditorInput)element); + setDocumentContent(document, (IEditorInput) element); setupDocument(element, document); return document; } @@ -122,11 +129,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ private long computeModificationStamp(ResourceSetInfo info) { int result = 0; - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); - if(file != null) { - if(file.getLocation() != null) { + if (file != null) { + if (file.getLocation() != null) { result += file.getLocation().toFile().lastModified(); } else { result += file.getModificationStamp(); @@ -152,7 +159,10 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi private TransactionalEditingDomain createEditingDomain() { TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain(); editingDomain.setID("org.eclipse.papyrus.uml.diagram.profile.EditingDomain"); //$NON-NLS-1$ - final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)).and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES)); + final NotificationFilter diagramResourceModifiedFilter = NotificationFilter + .createNotifierFilter(editingDomain.getResourceSet()) + .and(NotificationFilter.createEventTypeFilter(Notification.ADD)) + .and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES)); editingDomain.getResourceSet().eAdapters().add(new Adapter() { private Notifier myTarger; @@ -169,10 +179,10 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override public void notifyChanged(Notification notification) { - if(diagramResourceModifiedFilter.matches(notification)) { + if (diagramResourceModifiedFilter.matches(notification)) { Object value = notification.getNewValue(); - if(value instanceof Resource) { - ((Resource)value).setTrackingModification(true); + if (value instanceof Resource) { + ((Resource) value).setTrackingModification(true); } } } @@ -181,7 +191,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi public void setTarget(Notifier newTarget) { myTarger = newTarget; } + }); + return editingDomain; } @@ -189,21 +201,21 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ protected void setDocumentContent(IDocument document, IEditorInput element) throws CoreException { - IDiagramDocument diagramDocument = (IDiagramDocument)document; + IDiagramDocument diagramDocument = (IDiagramDocument) document; TransactionalEditingDomain domain = diagramDocument.getEditingDomain(); - if(element instanceof FileEditorInput) { - IStorage storage = ((FileEditorInput)element).getStorage(); + if (element instanceof FileEditorInput) { + IStorage storage = ((FileEditorInput) element).getStorage(); Diagram diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor()); document.setContent(diagram); - } else if(element instanceof URIEditorInput) { - URI uri = ((URIEditorInput)element).getURI(); + } else if (element instanceof URIEditorInput) { + URI uri = ((URIEditorInput) element).getURI(); Resource resource = null; try { resource = domain.getResourceSet().getResource(uri.trimFragment(), false); - if(resource == null) { + if (resource == null) { resource = domain.getResourceSet().createResource(uri.trimFragment()); } - if(!resource.isLoaded()) { + if (!resource.isLoaded()) { try { @SuppressWarnings({ "rawtypes", "unchecked" }) Map<?, ?> options = new HashMap(GMFResourceFactory.getDefaultLoadOptions()); @@ -215,16 +227,16 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi throw e; } } - if(uri.fragment() != null) { + if (uri.fragment() != null) { EObject rootElement = resource.getEObject(uri.fragment()); - if(rootElement instanceof Diagram) { + if (rootElement instanceof Diagram) { document.setContent(rootElement); return; } } else { - for(Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) { + for (Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) { Object rootElement = it.next(); - if(rootElement instanceof Diagram) { + if (rootElement instanceof Diagram) { document.setContent(rootElement); return; } @@ -233,17 +245,21 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi throw new RuntimeException(Messages.UMLDocumentProvider_NoDiagramInResourceError); } catch (Exception e) { CoreException thrownExcp = null; - if(e instanceof CoreException) { - thrownExcp = (CoreException)e; + if (e instanceof CoreException) { + thrownExcp = (CoreException) e; } else { String msg = e.getLocalizedMessage(); - thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e)); + thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, + msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e)); } throw thrownExcp; } } else { - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ - null)); + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, + NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ + "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + null)); } } @@ -253,7 +269,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override public long getModificationStamp(Object element) { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { + if (info != null) { return computeModificationStamp(info); } return super.getModificationStamp(element); @@ -265,9 +281,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override public boolean isDeleted(Object element) { IDiagramDocument document = getDiagramDocument(element); - if(document != null) { + if (document != null) { Resource diagramResource = document.getDiagram().eResource(); - if(diagramResource != null) { + if (diagramResource != null) { IFile file = WorkspaceSynchronizer.getFile(diagramResource); return file == null || file.getLocation() == null || !file.getLocation().toFile().exists(); } @@ -279,7 +295,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ public ResourceSetInfo getResourceSetInfo(Object editorInput) { - return (ResourceSetInfo)super.getElementInfo(editorInput); + return (ResourceSetInfo) super.getElementInfo(editorInput); } /** @@ -287,8 +303,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ @Override protected void disposeElementInfo(Object element, ElementInfo info) { - if(info instanceof ResourceSetInfo) { - ResourceSetInfo resourceSetInfo = (ResourceSetInfo)info; + if (info instanceof ResourceSetInfo) { + ResourceSetInfo resourceSetInfo = (ResourceSetInfo) info; resourceSetInfo.dispose(); } super.disposeElementInfo(element, info); @@ -300,17 +316,19 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override protected void doValidateState(Object element, Object computationContext) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { + if (info != null) { LinkedList<IFile> files2Validate = new LinkedList<IFile>(); - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); - if(file != null && file.isReadOnly()) { + if (file != null && file.isReadOnly()) { files2Validate.add(file); } } - ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), computationContext); + ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), + computationContext); } + super.doValidateState(element, computationContext); } @@ -320,8 +338,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override public boolean isReadOnly(Object element) { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { - if(info.isUpdateCache()) { + if (info != null) { + if (info.isUpdateCache()) { try { updateCache(element); } catch (CoreException ex) { @@ -339,14 +357,14 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ @Override public boolean isModifiable(Object element) { - if(!isStateValidated(element)) { - if(element instanceof FileEditorInput || element instanceof URIEditorInput) { + if (!isStateValidated(element)) { + if (element instanceof FileEditorInput || element instanceof URIEditorInput) { return true; } } ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { - if(info.isUpdateCache()) { + if (info != null) { + if (info.isUpdateCache()) { try { updateCache(element); } catch (CoreException ex) { @@ -364,11 +382,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ protected void updateCache(Object element) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + if (info != null) { + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); - if(file != null && file.isReadOnly()) { + if (file != null && file.isReadOnly()) { info.setReadOnly(true); info.setModifiable(false); return; @@ -386,7 +404,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override protected void doUpdateStateCache(Object element) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { + if (info != null) { info.setUpdateCache(true); } super.doUpdateStateCache(element); @@ -398,7 +416,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override public boolean isSynchronized(Object element) { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { + if (info != null) { return info.isSynchronized(); } return super.isSynchronized(element); @@ -410,12 +428,12 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override protected ISchedulingRule getResetRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { + if (info != null) { LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>(); - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); - if(file != null) { + if (file != null) { rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file)); } } @@ -430,12 +448,12 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override protected ISchedulingRule getSaveRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { + if (info != null) { LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>(); - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); - if(file != null) { + if (file != null) { rules.add(computeSchedulingRule(file)); } } @@ -450,12 +468,12 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override protected ISchedulingRule getSynchronizeRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { + if (info != null) { LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>(); - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); - if(file != null) { + if (file != null) { rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file)); } } @@ -470,16 +488,17 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override protected ISchedulingRule getValidateStateRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { + if (info != null) { LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>(); - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); - if(file != null) { + if (file != null) { files.add(file); } } - return ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule(files.toArray(new IFile[files.size()])); + return ResourcesPlugin.getWorkspace().getRuleFactory() + .validateEditRule(files.toArray(new IFile[files.size()])); } return null; } @@ -488,7 +507,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) { - if(toCreateOrModify.exists()) { + if (toCreateOrModify.exists()) { return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify); } IResource parent = toCreateOrModify; @@ -501,7 +520,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ toCreateOrModify = parent; parent = toCreateOrModify.getParent(); - } while(parent != null && !parent.exists()); + } while (parent != null && !parent.exists()); + return ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify); } @@ -511,8 +531,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi @Override protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + if (info != null) { + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); handleElementChanged(info, nextResource, monitor); } @@ -525,25 +545,31 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ @Override - protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException { + protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) + throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); - if(info != null) { - if(!overwrite && !info.isSynchronized()) { - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, IResourceStatus.OUT_OF_SYNC_LOCAL, Messages.UMLDocumentProvider_UnsynchronizedFileSaveError, null)); + if (info != null) { + if (!overwrite && !info.isSynchronized()) { + throw new CoreException( + new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, IResourceStatus.OUT_OF_SYNC_LOCAL, + Messages.UMLDocumentProvider_UnsynchronizedFileSaveError, null)); } info.stopResourceListening(); fireElementStateChanging(element); try { - monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); //"Saving diagram" - for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { + monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, + info.getResourceSet().getResources().size() + 1); //"Saving diagram" + for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); - monitor.setTaskName(NLS.bind(Messages.UMLDocumentProvider_SaveNextResourceTask, nextResource.getURI())); - if(nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) { + monitor.setTaskName( + NLS.bind(Messages.UMLDocumentProvider_SaveNextResourceTask, nextResource.getURI())); + if (nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) { try { nextResource.save(UMLDiagramEditorUtil.getSaveOptions()); } catch (IOException e) { fireElementStateChangeFailed(element); - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null)); + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, + EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null)); } } monitor.worked(1); @@ -559,29 +585,37 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi } else { URI newResoruceURI; List<IFile> affectedFiles = null; - if(element instanceof FileEditorInput) { - IFile newFile = ((FileEditorInput)element).getFile(); + if (element instanceof FileEditorInput) { + IFile newFile = ((FileEditorInput) element).getFile(); affectedFiles = Collections.singletonList(newFile); newResoruceURI = URI.createPlatformResourceURI(newFile.getFullPath().toString(), true); - } else if(element instanceof URIEditorInput) { - newResoruceURI = ((URIEditorInput)element).getURI(); + } else if (element instanceof URIEditorInput) { + newResoruceURI = ((URIEditorInput) element).getURI(); } else { fireElementStateChangeFailed(element); - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ - null)); + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, + NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ + "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + null)); } - if(false == document instanceof IDiagramDocument) { + if (false == document instanceof IDiagramDocument) { fireElementStateChangeFailed(element); - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$ + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, + "Incorrect document used: " + document //$NON-NLS-1$ + + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", //$NON-NLS-1$ + null)); } - IDiagramDocument diagramDocument = (IDiagramDocument)document; - final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI); + IDiagramDocument diagramDocument = (IDiagramDocument) document; + final Resource newResource = diagramDocument.getEditingDomain().getResourceSet() + .createResource(newResoruceURI); final Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram()); try { - new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) { - + new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), + NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) { @Override - protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { + protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { newResource.getContents().add(diagramCopy); return CommandResult.newOKCommandResult(); } @@ -589,10 +623,12 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi newResource.save(UMLDiagramEditorUtil.getSaveOptions()); } catch (ExecutionException e) { fireElementStateChangeFailed(element); - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); + throw new CoreException( + new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); } catch (IOException e) { fireElementStateChangeFailed(element); - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); + throw new CoreException( + new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); } newResource.unload(); } @@ -603,15 +639,17 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ protected void handleElementChanged(ResourceSetInfo info, Resource changedResource, IProgressMonitor monitor) { IFile file = WorkspaceSynchronizer.getFile(changedResource); - if(file != null) { + if (file != null) { try { file.refreshLocal(IResource.DEPTH_INFINITE, monitor); } catch (CoreException ex) { - UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_handleElementContentChanged, ex); + UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_handleElementContentChanged, + ex); // Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged } } changedResource.unload(); + fireElementContentAboutToBeReplaced(info.getEditorInput()); removeUnchangedElementListeners(info.getEditorInput(), info); info.fStatus = null; @@ -620,7 +658,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi } catch (CoreException e) { info.fStatus = e.getStatus(); } - if(!info.fCanBeSaved) { + if (!info.fCanBeSaved) { info.setModificationStamp(computeModificationStamp(info)); } addUnchangedElementListeners(info.getEditorInput(), info); @@ -631,8 +669,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ protected void handleElementMoved(IEditorInput input, URI uri) { - if(input instanceof FileEditorInput) { - IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1)); + if (input instanceof FileEditorInput) { + IFile newFile = ResourcesPlugin.getWorkspace().getRoot() + .getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1)); fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile)); return; } @@ -652,8 +691,8 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ public IDiagramDocument getDiagramDocument(Object element) { IDocument doc = getDocument(element); - if(doc instanceof IDiagramDocument) { - return (IDiagramDocument)doc; + if (doc instanceof IDiagramDocument) { + return (IDiagramDocument) doc; } return null; } @@ -776,7 +815,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi public void dispose() { stopResourceListening(); getResourceSet().eAdapters().remove(myResourceSetListener); - for(Iterator<Resource> it = getLoadedResourcesIterator(); it.hasNext();) { + for (Iterator<Resource> it = getLoadedResourcesIterator(); it.hasNext();) { Resource resource = it.next(); resource.unload(); } @@ -876,14 +915,13 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ public boolean handleResourceChanged(final Resource resource) { - synchronized(ResourceSetInfo.this) { - if(ResourceSetInfo.this.fCanBeSaved) { + synchronized (ResourceSetInfo.this) { + if (ResourceSetInfo.this.fCanBeSaved) { ResourceSetInfo.this.setUnSynchronized(resource); return true; } } Display.getDefault().asyncExec(new Runnable() { - @Override public void run() { handleElementChanged(ResourceSetInfo.this, resource, null); @@ -896,14 +934,13 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ public boolean handleResourceDeleted(Resource resource) { - synchronized(ResourceSetInfo.this) { - if(ResourceSetInfo.this.fCanBeSaved) { + synchronized (ResourceSetInfo.this) { + if (ResourceSetInfo.this.fCanBeSaved) { ResourceSetInfo.this.setUnSynchronized(resource); return true; } } Display.getDefault().asyncExec(new Runnable() { - @Override public void run() { fireElementDeleted(ResourceSetInfo.this.getEditorInput()); @@ -916,15 +953,14 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ public boolean handleResourceMoved(Resource resource, final URI newURI) { - synchronized(ResourceSetInfo.this) { - if(ResourceSetInfo.this.fCanBeSaved) { + synchronized (ResourceSetInfo.this) { + if (ResourceSetInfo.this.fCanBeSaved) { ResourceSetInfo.this.setUnSynchronized(resource); return true; } } - if(myDocument.getDiagram().eResource() == resource) { + if (myDocument.getDiagram().eResource() == resource) { Display.getDefault().asyncExec(new Runnable() { - @Override public void run() { handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI); @@ -958,7 +994,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ public ResourceSetModificationListener(ResourceSetInfo info) { myInfo = info; - myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET).or(NotificationFilter.createEventTypeFilter(Notification.UNSET)).and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED)); + myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET) + .or(NotificationFilter.createEventTypeFilter(Notification.UNSET)) + .and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED)); } /** @@ -966,33 +1004,34 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ @Override public void notifyChanged(Notification notification) { - if(notification.getNotifier() instanceof ResourceSet) { + if (notification.getNotifier() instanceof ResourceSet) { super.notifyChanged(notification); } - if(!notification.isTouch() && myModifiedFilter.matches(notification)) { - if(notification.getNotifier() instanceof Resource) { - Resource resource = (Resource)notification.getNotifier(); - if(resource.isLoaded()) { + if (!notification.isTouch() && myModifiedFilter.matches(notification)) { + if (notification.getNotifier() instanceof Resource) { + Resource resource = (Resource) notification.getNotifier(); + if (resource.isLoaded()) { boolean modified = false; - for(Iterator<Resource> it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) { + for (Iterator<Resource> it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) { Resource nextResource = it.next(); - if(nextResource.isLoaded()) { + if (nextResource.isLoaded()) { modified = nextResource.isModified(); } } boolean dirtyStateChanged = false; - synchronized(myInfo) { - if(modified != myInfo.fCanBeSaved) { + synchronized (myInfo) { + if (modified != myInfo.fCanBeSaved) { myInfo.fCanBeSaved = modified; dirtyStateChanged = true; } - if(!resource.isModified()) { + if (!resource.isModified()) { myInfo.setSynchronized(resource); } } - if(dirtyStateChanged) { + if (dirtyStateChanged) { fireElementDirtyStateChanged(myInfo.getEditorInput(), modified); - if(!modified) { + + if (!modified) { myInfo.setModificationStamp(computeModificationStamp(myInfo)); } } 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 39715ff2dbd..2d8ff917eee 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 @@ -58,10 +58,10 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate { public void selectionChanged(IAction action, ISelection selection) { domainModelURI = null; action.setEnabled(false); - if(selection instanceof IStructuredSelection == false || selection.isEmpty()) { + if (selection instanceof IStructuredSelection == false || selection.isEmpty()) { return; } - IFile file = (IFile)((IStructuredSelection)selection).getFirstElement(); + IFile file = (IFile) ((IStructuredSelection) selection).getFirstElement(); domainModelURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true); action.setEnabled(true); } @@ -86,8 +86,9 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate { } catch (WrappedException ex) { UMLDiagramEditorPlugin.getInstance().logError("Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$ } - if(diagramRoot == null) { - MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle, Messages.InitDiagramFile_ResourceErrorDialogMessage); + if (diagramRoot == null) { + MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle, + Messages.InitDiagramFile_ResourceErrorDialogMessage); return; } Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain); 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 c8df23da2d6..3c4040ad666 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 @@ -30,7 +30,8 @@ public class UMLLinkDescriptor extends UpdaterLinkDescriptor { /** * @generated */ - public UMLLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType, String linkVID) { + public UMLLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType, + String linkVID) { super(source, destination, linkElement, elementType, linkVID); } } 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 d0e363d1077..5949a81bc75 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 @@ -32,11 +32,12 @@ public class UMLMatchingStrategy implements IEditorMatchingStrategy { } catch (PartInitException e) { return false; } - if(editorInput.equals(input)) { + + if (editorInput.equals(input)) { return true; } - if(editorInput instanceof URIEditorInput && input instanceof URIEditorInput) { - return ((URIEditorInput)editorInput).getURI().equals(((URIEditorInput)input).getURI()); + if (editorInput instanceof URIEditorInput && input instanceof URIEditorInput) { + return ((URIEditorInput) editorInput).getURI().equals(((URIEditorInput) input).getURI()); } return false; } 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 c6032f8af6f..6df4615fd38 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 @@ -67,25 +67,32 @@ public class UMLNewDiagramFileWizard extends Wizard { assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$ assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$ assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$ - myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY); + + myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName, + StructuredSelection.EMPTY); myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle); - myFileCreationPage.setDescription(NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, ProfileDiagramEditPart.MODEL_ID)); + myFileCreationPage.setDescription( + NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, ProfileDiagramEditPart.MODEL_ID)); IPath filePath; String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment()); - if(domainModelURI.isPlatformResource()) { + if (domainModelURI.isPlatformResource()) { filePath = new Path(domainModelURI.trimSegments(1).toPlatformString(true)); - } else if(domainModelURI.isFile()) { + } else if (domainModelURI.isFile()) { filePath = new Path(domainModelURI.trimSegments(1).toFileString()); } else { // TODO : use some default path throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$ } myFileCreationPage.setContainerFullPath(filePath); - myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "PapyrusUMLProfile_diagram")); //$NON-NLS-1$ - diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName); + myFileCreationPage + .setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "PapyrusUMLProfile_diagram")); //$NON-NLS-1$ + + diagramRootElementSelectionPage = new DiagramRootElementSelectionPage( + Messages.UMLNewDiagramFileWizard_RootSelectionPageName); diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle); diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription); diagramRootElementSelectionPage.setModelElement(diagramRoot); + myEditingDomain = editingDomain; } @@ -110,15 +117,19 @@ public class UMLNewDiagramFileWizard extends Wizard { URI diagramModelURI = URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true); ResourceSet resourceSet = myEditingDomain.getResourceSet(); final Resource diagramResource = resourceSet.createResource(diagramModelURI); - AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) { + AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain, + Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) { @Override - protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - String diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement()); - if(diagramVID.equals(ProfileDiagramEditPart.VISUAL_ID)) { + protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { + String diagramVID = UMLVisualIDRegistry + .getDiagramVisualID(diagramRootElementSelectionPage.getModelElement()); + if (diagramVID.equals(ProfileDiagramEditPart.VISUAL_ID)) { return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError); } - Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(), ProfileDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); + Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(), + ProfileDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); diagramResource.getContents().add(diagram); new UMLDiagramContentInitializer().initDiagramContent(diagram); return CommandResult.newOKCommandResult(); @@ -163,11 +174,13 @@ public class UMLNewDiagramFileWizard extends Wizard { */ @Override protected boolean validatePage() { - if(getModelElement() == null) { + if (getModelElement() == null) { setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage); return false; } - boolean result = ViewService.getInstance().provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()), ProfileDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT)); + boolean result = ViewService.getInstance() + .provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()), + ProfileDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT)); setErrorMessage(result ? null : Messages.UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage); return result; } 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 afdf4c76fa7..75c5960f7d2 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 @@ -128,6 +128,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { * @generated */ public UMLPaletteFactory() { + } /** @@ -135,61 +136,61 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ @Override public Tool createTool(String toolId) { - if(toolId.equals(CREATECLASS6CREATIONTOOL)) { + if (toolId.equals(CREATECLASS6CREATIONTOOL)) { return createClass6CreationTool(); } - if(toolId.equals(CREATECOMMENT2CREATIONTOOL)) { + if (toolId.equals(CREATECOMMENT2CREATIONTOOL)) { return createComment2CreationTool(); } - if(toolId.equals(CREATECONSTRAINT3CREATIONTOOL)) { + if (toolId.equals(CREATECONSTRAINT3CREATIONTOOL)) { return createConstraint3CreationTool(); } - if(toolId.equals(CREATEDATATYPE4CREATIONTOOL)) { + if (toolId.equals(CREATEDATATYPE4CREATIONTOOL)) { return createDataType4CreationTool(); } - if(toolId.equals(CREATEENUMERATION5CREATIONTOOL)) { + if (toolId.equals(CREATEENUMERATION5CREATIONTOOL)) { return createEnumeration5CreationTool(); } - if(toolId.equals(CREATEENUMERATIONLITERAL6CREATIONTOOL)) { + if (toolId.equals(CREATEENUMERATIONLITERAL6CREATIONTOOL)) { return createEnumerationLiteral6CreationTool(); } - if(toolId.equals(CREATEIMPORTMETACLASS7CREATIONTOOL)) { + if (toolId.equals(CREATEIMPORTMETACLASS7CREATIONTOOL)) { return createImportMetaclass7CreationTool(); } - if(toolId.equals(CREATEOPERATION8CREATIONTOOL)) { + if (toolId.equals(CREATEOPERATION8CREATIONTOOL)) { return createOperation8CreationTool(); } - if(toolId.equals(CREATEPACKAGE9CREATIONTOOL)) { + if (toolId.equals(CREATEPACKAGE9CREATIONTOOL)) { return createPackage9CreationTool(); } - if(toolId.equals(CREATEPROFILE10CREATIONTOOL)) { + if (toolId.equals(CREATEPROFILE10CREATIONTOOL)) { return createProfile10CreationTool(); } - if(toolId.equals(CREATEPRIMITIVETYPE11CREATIONTOOL)) { + if (toolId.equals(CREATEPRIMITIVETYPE11CREATIONTOOL)) { return createPrimitiveType11CreationTool(); } - if(toolId.equals(CREATEPROPERTY12CREATIONTOOL)) { + if (toolId.equals(CREATEPROPERTY12CREATIONTOOL)) { return createProperty12CreationTool(); } - if(toolId.equals(CREATESTEREOTYPE13CREATIONTOOL)) { + if (toolId.equals(CREATESTEREOTYPE13CREATIONTOOL)) { return createStereotype13CreationTool(); } - if(toolId.equals(CREATEASSOCIATION1CREATIONTOOL)) { + if (toolId.equals(CREATEASSOCIATION1CREATIONTOOL)) { return createAssociation1CreationTool(); } - if(toolId.equals(CREATECONTEXTLINK6CREATIONTOOL)) { + if (toolId.equals(CREATECONTEXTLINK6CREATIONTOOL)) { return createContextLink6CreationTool(); } - if(toolId.equals(CREATEEXTENSION3CREATIONTOOL)) { + if (toolId.equals(CREATEEXTENSION3CREATIONTOOL)) { return createExtension3CreationTool(); } - if(toolId.equals(CREATEGENERALIZATION4CREATIONTOOL)) { + if (toolId.equals(CREATEGENERALIZATION4CREATIONTOOL)) { return createGeneralization4CreationTool(); } - if(toolId.equals(CREATELINK5CREATIONTOOL)) { + if (toolId.equals(CREATELINK5CREATIONTOOL)) { return createLink5CreationTool(); } - if(toolId.equals(CREATEPROFILEAPPLICATION6CREATIONTOOL)) { + if (toolId.equals(CREATEPROFILEAPPLICATION6CREATIONTOOL)) { return createProfileApplication6CreationTool(); } // default return: null @@ -201,6 +202,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ @Override public Object getTemplate(String templateId) { + // default return: null return null; } @@ -210,8 +212,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createClass6CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Class_3010); - types.add(UMLElementTypes.Class_2008); + types.add(UMLElementTypes.Class_Shape_CN); + types.add(UMLElementTypes.Class_Shape); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -221,8 +223,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createComment2CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Comment_1002); - types.add(UMLElementTypes.Comment_1007); + types.add(UMLElementTypes.Comment_Shape); + types.add(UMLElementTypes.Comment_Shape_CN); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -232,8 +234,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createConstraint3CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Constraint_1014); - types.add(UMLElementTypes.Constraint_1028); + types.add(UMLElementTypes.Constraint_PackagedElementShape); + types.add(UMLElementTypes.Constraint_PackagedElementShape_CN); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -243,8 +245,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createDataType4CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.DataType_2010); - types.add(UMLElementTypes.DataType_3027); + types.add(UMLElementTypes.DataType_Shape); + types.add(UMLElementTypes.DataType_Shape_CN); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -254,8 +256,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createEnumeration5CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Enumeration_2006); - types.add(UMLElementTypes.Enumeration_3025); + types.add(UMLElementTypes.Enumeration_Shape); + types.add(UMLElementTypes.Enumeration_Shape_CN); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -265,7 +267,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createEnumerationLiteral6CreationTool() { List<IElementType> types = new ArrayList<IElementType>(1); - types.add(UMLElementTypes.EnumerationLiteral_1037); + types.add(UMLElementTypes.EnumerationLiteral_LiteralLabel); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -275,8 +277,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createImportMetaclass7CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Class_1031); - types.add(UMLElementTypes.Class_3028); + types.add(UMLElementTypes.Class_MetaclassShape); + types.add(UMLElementTypes.Class_MetaclassShape_CN); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -286,8 +288,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createOperation8CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Operation_3019); - types.add(UMLElementTypes.Operation_3020); + types.add(UMLElementTypes.Operation_DataTypeOperationLabel); + types.add(UMLElementTypes.Operation_ClassOperationLabel); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -297,8 +299,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createPackage9CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Package_2007); - types.add(UMLElementTypes.Package_1012); + types.add(UMLElementTypes.Package_Shape); + types.add(UMLElementTypes.Package_Shape_CN); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -308,8 +310,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createProfile10CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Profile_1030); - types.add(UMLElementTypes.Profile_1024); + types.add(UMLElementTypes.Profile_Shape); + types.add(UMLElementTypes.Profile_Shape_CN); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -319,8 +321,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createPrimitiveType11CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.PrimitiveType_2009); - types.add(UMLElementTypes.PrimitiveType_3026); + types.add(UMLElementTypes.PrimitiveType_Shape); + types.add(UMLElementTypes.PrimitiveType_Shape_CN); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -330,8 +332,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createProperty12CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Property_3002); - types.add(UMLElementTypes.Property_3018); + types.add(UMLElementTypes.Property_ClassAttributeLabel); + types.add(UMLElementTypes.Property_DataTypeAttributeLabel); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -341,8 +343,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createStereotype13CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.Stereotype_1023); - types.add(UMLElementTypes.Stereotype_1026); + types.add(UMLElementTypes.Stereotype_Shape_CN); + types.add(UMLElementTypes.Stereotype_Shape); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -352,7 +354,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createAssociation1CreationTool() { List<IElementType> types = new ArrayList<IElementType>(1); - types.add(UMLElementTypes.Association_4001); + types.add(UMLElementTypes.Association_Edge); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -362,7 +364,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createContextLink6CreationTool() { List<IElementType> types = new ArrayList<IElementType>(1); - types.add(UMLElementTypes.ConstraintContext_8500); + types.add(UMLElementTypes.Constraint_ContextEdge); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -372,7 +374,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createExtension3CreationTool() { List<IElementType> types = new ArrayList<IElementType>(1); - types.add(UMLElementTypes.Extension_1013); + types.add(UMLElementTypes.Extension_Edge); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -382,7 +384,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createGeneralization4CreationTool() { List<IElementType> types = new ArrayList<IElementType>(1); - types.add(UMLElementTypes.Generalization_4002); + types.add(UMLElementTypes.Generalization_Edge); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -392,8 +394,8 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createLink5CreationTool() { List<IElementType> types = new ArrayList<IElementType>(2); - types.add(UMLElementTypes.CommentAnnotatedElement_1022); - types.add(UMLElementTypes.ConstraintConstrainedElement_4014); + types.add(UMLElementTypes.Comment_AnnotatedElementEdge); + types.add(UMLElementTypes.Constraint_ConstrainedElementEdge); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -403,7 +405,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { */ private Tool createProfileApplication6CreationTool() { List<IElementType> types = new ArrayList<IElementType>(1); - types.add(UMLElementTypes.ProfileApplication_1045); + types.add(UMLElementTypes.ProfileApplication_Edge); 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 638a5965de3..509b38af656 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 @@ -23,10 +23,10 @@ public class UMLUriEditorInputTester extends PropertyTester { * @generated */ public boolean test(Object receiver, String method, Object[] args, Object expectedValue) { - if(false == receiver instanceof URIEditorInput) { + if (false == receiver instanceof URIEditorInput) { return false; } - URIEditorInput editorInput = (URIEditorInput)receiver; + URIEditorInput editorInput = (URIEditorInput) receiver; return "PapyrusUMLProfile_diagram".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$ } } 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 c1bbaa59808..16ebc80463c 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 @@ -41,8 +41,8 @@ public class UMLVisualIDRegistry { * @generated */ public static String getVisualID(View view) { - if(view instanceof Diagram) { - if(ProfileDiagramEditPart.MODEL_ID.equals(view.getType())) { + if (view instanceof Diagram) { + if (ProfileDiagramEditPart.MODEL_ID.equals(view.getType())) { return ProfileDiagramEditPart.VISUAL_ID; } else { return null; @@ -56,12 +56,12 @@ public class UMLVisualIDRegistry { */ public static String getModelID(View view) { View diagram = view.getDiagram(); - while(view != diagram) { + while (view != diagram) { EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$ - if(annotation != null) { + if (annotation != null) { return annotation.getDetails().get("modelID"); //$NON-NLS-1$ } - view = (View)view.eContainer(); + view = (View) view.eContainer(); } return diagram != null ? diagram.getType() : null; } @@ -84,7 +84,7 @@ public class UMLVisualIDRegistry { * @generated */ public static String getDiagramVisualID(EObject domainElement) { - if(domainElement == null) { + if (domainElement == null) { return null; } return ProfileDiagramEditPart.VISUAL_ID; @@ -95,170 +95,172 @@ public class UMLVisualIDRegistry { * we manually test if it's a class or a metaclass */ public static String getNodeVisualID(View containerView, EObject domainElement) { - if(domainElement == null) { + if (domainElement == null) { return null; } - String containerModelID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getModelID(containerView); - if(!ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) { + String containerModelID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry + .getModelID(containerView); + if (!ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) { return null; } String containerVisualID; - if(ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) { - containerVisualID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getVisualID(containerView); + if (ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) { + containerVisualID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry + .getVisualID(containerView); } else { - if(containerView instanceof Diagram) { + if (containerView instanceof Diagram) { containerVisualID = ProfileDiagramEditPart.VISUAL_ID; } else { return null; } } - switch(containerVisualID) { + switch (containerVisualID) { case ProfileDiagramEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) { return DependencyNodeEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) { return AssociationNodeEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { return StereotypeEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { - if(domainElement instanceof Type) { - if(Util.isMetaclass((Type)domainElement)) { + if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { + if (domainElement instanceof Type) { + if (Util.isMetaclass((Type) domainElement)) { return MetaclassEditPart.VISUAL_ID; } } return ClassEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { return CommentEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { return ConstraintEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { return ModelEditPartTN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { return ProfileEditPartTN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { return PackageEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { return EnumerationEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { return PrimitiveTypeEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { return DataTypeEditPart.VISUAL_ID; } - if(NotationPackage.eINSTANCE.getDiagram().isSuperTypeOf(domainElement.eClass())) { + if (NotationPackage.eINSTANCE.getDiagram().isSuperTypeOf(domainElement.eClass())) { return ShortCutDiagramEditPart.VISUAL_ID; } break; case PackageEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { return PackageEditPartCN.VISUAL_ID; } break; case PackagePackageableElementCompartmentEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { return CommentEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { return ModelEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { return ProfileEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { return PackageEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { return ConstraintEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { return EnumerationEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { return PrimitiveTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { return DataTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { return StereotypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { return ClassEditPartCN.VISUAL_ID; } break; case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { return CommentEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { return ModelEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { return ProfileEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { return PackageEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { return ConstraintEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { return EnumerationEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { return PrimitiveTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { return DataTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { return StereotypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { return ClassEditPartCN.VISUAL_ID; } break; case ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { return StereotypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { return ModelEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { return ProfileEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { return PackageEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { return ConstraintEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { return EnumerationEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { return PrimitiveTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { return DataTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { return CommentEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { - if(domainElement instanceof Type) { - if(Util.isMetaclass((Type)domainElement)) { + if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { + if (domainElement instanceof Type) { + if (Util.isMetaclass((Type) domainElement)) { return MetaclassEditPartCN.VISUAL_ID; } } @@ -266,36 +268,36 @@ public class UMLVisualIDRegistry { } break; case ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getStereotype().isSuperTypeOf(domainElement.eClass())) { return StereotypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { return ModelEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { return ProfileEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { return PackageEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { return ConstraintEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { return EnumerationEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { return PrimitiveTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { return DataTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { return CommentEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { - if(domainElement instanceof Type) { - if(Util.isMetaclass((Type)domainElement)) { + if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { + if (domainElement instanceof Type) { + if (Util.isMetaclass((Type) domainElement)) { return MetaclassEditPartCN.VISUAL_ID; } } @@ -303,130 +305,130 @@ public class UMLVisualIDRegistry { } break; case StereotypeAttributeCompartmentEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { return ClassPropertyEditPart.VISUAL_ID; } break; case StereotypeAttributeCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { return ClassPropertyEditPart.VISUAL_ID; } break; case StereotypeOperationCompartmentEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { return ClassOperationEditPart.VISUAL_ID; } break; case StereotypeOperationCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { return ClassOperationEditPart.VISUAL_ID; } break; case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { return CommentEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { return ModelEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { return ProfileEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { return PackageEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { return ConstraintEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { return EnumerationEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { return PrimitiveTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { return DataTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { return ClassEditPartCN.VISUAL_ID; } break; case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) { return CommentEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getModel().isSuperTypeOf(domainElement.eClass())) { return ModelEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProfile().isSuperTypeOf(domainElement.eClass())) { return ProfileEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass())) { return PackageEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) { return ConstraintEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) { return EnumerationEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) { return PrimitiveTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) { return DataTypeEditPartCN.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) { return ClassEditPartCN.VISUAL_ID; } break; case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) { return EnumerationLiteralEditPart.VISUAL_ID; } break; case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) { return EnumerationLiteralEditPart.VISUAL_ID; } break; case DataTypeAttributeCompartmentEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { return DataTypePropertyEditPart.VISUAL_ID; } break; case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { return DataTypePropertyEditPart.VISUAL_ID; } break; case DataTypeOperationCompartmentEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { return DataTypeOperationEditPart.VISUAL_ID; } break; case DataTypeOperationCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { return DataTypeOperationEditPart.VISUAL_ID; } break; case ClassAttributeCompartmentEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { return ClassPropertyEditPart.VISUAL_ID; } break; case ClassAttributeCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) { return ClassPropertyEditPart.VISUAL_ID; } break; case ClassOperationCompartmentEditPart.VISUAL_ID: - if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { return ClassOperationEditPart.VISUAL_ID; } break; case ClassOperationCompartmentEditPartCN.VISUAL_ID: - if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) { return ClassOperationEditPart.VISUAL_ID; } break; @@ -438,573 +440,575 @@ public class UMLVisualIDRegistry { * @generated */ public static boolean canCreateNode(View containerView, String nodeVisualID) { - String containerModelID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getModelID(containerView); - if(!ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) { + String containerModelID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry + .getModelID(containerView); + if (!ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) { return false; } String containerVisualID; - if(ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) { - containerVisualID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getVisualID(containerView); + if (ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) { + containerVisualID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry + .getVisualID(containerView); } else { - if(containerView instanceof Diagram) { + if (containerView instanceof Diagram) { containerVisualID = ProfileDiagramEditPart.VISUAL_ID; } else { return false; } } - if(containerVisualID != null) { - switch(containerVisualID) { + if (containerVisualID != null) { + switch (containerVisualID) { case ProfileDiagramEditPart.VISUAL_ID: - if(DependencyNodeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DependencyNodeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(AssociationNodeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationNodeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(StereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(MetaclassEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (MetaclassEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(CommentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (CommentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelEditPartTN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelEditPartTN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfileEditPartTN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileEditPartTN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackageEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (PackageEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PrimitiveTypeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ShortCutDiagramEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ShortCutDiagramEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case DependencyNodeEditPart.VISUAL_ID: - if(MultiDependencyLabelEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (MultiDependencyLabelEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case StereotypeEditPart.VISUAL_ID: - if(StereotypeNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(StereotypeAttributeCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeAttributeCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(StereotypeOperationCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeOperationCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ClassEditPart.VISUAL_ID: - if(ClassNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassOperationCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassOperationCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassAttributeCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassAttributeCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case MetaclassEditPart.VISUAL_ID: - if(MetaclassNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (MetaclassNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case CommentEditPart.VISUAL_ID: - if(CommentBodyEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (CommentBodyEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ConstraintEditPart.VISUAL_ID: - if(ConstraintNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintBodyEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintBodyEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ModelEditPartTN.VISUAL_ID: - if(ModelNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ModelNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelPackageableElementCompartmentEditPartTN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelPackageableElementCompartmentEditPartTN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ProfileEditPartTN.VISUAL_ID: - if(ProfileNameEditPartTN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileNameEditPartTN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case PackageEditPart.VISUAL_ID: - if(PackageNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (PackageNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackagePackageableElementCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (PackagePackageableElementCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case EnumerationEditPart.VISUAL_ID: - if(EnumerationNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case PrimitiveTypeEditPart.VISUAL_ID: - if(PrimitiveTypeNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case DataTypeEditPart.VISUAL_ID: - if(DataTypeNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeAttributeCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeAttributeCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeOperationCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeOperationCompartmentEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ShortCutDiagramEditPart.VISUAL_ID: - if(DiagramNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DiagramNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case PrimitiveTypeEditPartCN.VISUAL_ID: - if(PrimitiveTypeNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case StereotypeEditPartCN.VISUAL_ID: - if(StereotypeNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(StereotypeAttributeCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeAttributeCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(StereotypeOperationCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeOperationCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ClassEditPartCN.VISUAL_ID: - if(ClassNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassAttributeCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassAttributeCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassOperationCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassOperationCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case MetaclassEditPartCN.VISUAL_ID: - if(MetaclassNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (MetaclassNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case CommentEditPartCN.VISUAL_ID: - if(CommentBodyEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (CommentBodyEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ModelEditPartCN.VISUAL_ID: - if(ModelNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelPackageableElementCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelPackageableElementCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ProfileEditPartCN.VISUAL_ID: - if(ProfileNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case PackageEditPartCN.VISUAL_ID: - if(PackageNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackageNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackagePackageableElementCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ConstraintEditPartCN.VISUAL_ID: - if(ConstraintNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintBodyEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintBodyEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case EnumerationEditPartCN.VISUAL_ID: - if(EnumerationNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case DataTypeEditPartCN.VISUAL_ID: - if(DataTypeNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeNameEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeAttributeCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeOperationCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeOperationCompartmentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case PackagePackageableElementCompartmentEditPart.VISUAL_ID: - if(CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(StereotypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID: - if(CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(StereotypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID: - if(StereotypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(MetaclassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (MetaclassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID: - if(StereotypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (StereotypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(MetaclassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (MetaclassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case StereotypeAttributeCompartmentEditPart.VISUAL_ID: - if(ClassPropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassPropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case StereotypeAttributeCompartmentEditPartCN.VISUAL_ID: - if(ClassPropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassPropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case StereotypeOperationCompartmentEditPart.VISUAL_ID: - if(ClassOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case StereotypeOperationCompartmentEditPartCN.VISUAL_ID: - if(ClassOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID: - if(CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID: - if(CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (CommentEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ModelEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ProfileEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PackageEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ConstraintEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (PrimitiveTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { + if (ClassEditPartCN.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID: - if(EnumerationLiteralEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationLiteralEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID: - if(EnumerationLiteralEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (EnumerationLiteralEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case DataTypeAttributeCompartmentEditPart.VISUAL_ID: - if(DataTypePropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypePropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID: - if(DataTypePropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypePropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case DataTypeOperationCompartmentEditPart.VISUAL_ID: - if(DataTypeOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case DataTypeOperationCompartmentEditPartCN.VISUAL_ID: - if(DataTypeOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DataTypeOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ClassAttributeCompartmentEditPart.VISUAL_ID: - if(ClassPropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassPropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ClassAttributeCompartmentEditPartCN.VISUAL_ID: - if(ClassPropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassPropertyEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ClassOperationCompartmentEditPart.VISUAL_ID: - if(ClassOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ClassOperationCompartmentEditPartCN.VISUAL_ID: - if(ClassOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ClassOperationEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case AssociationEditPart.VISUAL_ID: - if(AssociationAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(AssociationNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(AssociationRoleTargetEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationRoleTargetEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(AssociationRoleSourceEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationRoleSourceEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(AssociationMultiplicitySourceEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationMultiplicitySourceEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(AssociationMultiplicityTargetEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationMultiplicityTargetEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case AssociationBranchEditPart.VISUAL_ID: - if(AssociationBranchRoleEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationBranchRoleEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(AssociationBranchMultiplicityEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AssociationBranchMultiplicityEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case GeneralizationEditPart.VISUAL_ID: - if(GeneralizationAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (GeneralizationAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case DependencyEditPart.VISUAL_ID: - if(DependencyNameEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DependencyNameEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(DependencyAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (DependencyAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ElementImportEditPart.VISUAL_ID: - if(ElementImportAliasEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ElementImportAliasEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } - if(AppliedStereotypeElementImportEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (AppliedStereotypeElementImportEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case PackageImportEditPart.VISUAL_ID: - if(PackageImportAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (PackageImportAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; case ContextLinkEditPart.VISUAL_ID: - if(ContextLinkAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { + if (ContextLinkAppliedStereotypeEditPart.VISUAL_ID.equals(nodeVisualID)) { return true; } break; @@ -1017,34 +1021,34 @@ public class UMLVisualIDRegistry { * @generated */ public static String getLinkWithClassVisualID(EObject domainElement) { - if(domainElement == null) { + if (domainElement == null) { return null; } - if(UMLPackage.eINSTANCE.getExtension().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getExtension().isSuperTypeOf(domainElement.eClass())) { return ExtensionEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) { return AssociationEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) { return ProfileApplicationEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) { return AssociationBranchEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) { return GeneralizationEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) { return DependencyEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) { return DependencyBranchEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) { return ElementImportEditPart.VISUAL_ID; } - if(UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) { return PackageImportEditPart.VISUAL_ID; } return null; @@ -1064,7 +1068,7 @@ public class UMLVisualIDRegistry { * @generated */ public static boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) { - if(candidate == null) { + if (candidate == null) { //unrecognized id is always bad return false; } @@ -1076,8 +1080,8 @@ public class UMLVisualIDRegistry { * @generated */ public static boolean isCompartmentVisualID(String visualID) { - if(visualID != null) { - switch(visualID) { + if (visualID != null) { + switch (visualID) { case PackagePackageableElementCompartmentEditPart.VISUAL_ID: case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID: case ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID: @@ -1108,8 +1112,8 @@ public class UMLVisualIDRegistry { * @generated */ public static boolean isSemanticLeafVisualID(String visualID) { - if(visualID != null) { - switch(visualID) { + if (visualID != null) { + switch (visualID) { case ProfileDiagramEditPart.VISUAL_ID: return false; case CommentEditPart.VISUAL_ID: @@ -1138,7 +1142,6 @@ public class UMLVisualIDRegistry { * @generated */ public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() { - /** * @generated */ @@ -1160,7 +1163,8 @@ public class UMLVisualIDRegistry { */ @Override public String getNodeVisualID(View containerView, EObject domainElement) { - return org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement); + return org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getNodeVisualID(containerView, + domainElement); } /** @@ -1168,7 +1172,8 @@ public class UMLVisualIDRegistry { */ @Override public boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) { - return org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate); + return org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, + domainElement, candidate); } /** 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 a59382d5033..2249010c399 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 @@ -74,8 +74,8 @@ public class ValidateAction extends Action { @Override public void run() { IWorkbenchPart workbenchPart = page.getActivePart(); - if(workbenchPart instanceof IDiagramWorkbenchPart) { - final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart)workbenchPart; + if (workbenchPart instanceof IDiagramWorkbenchPart) { + final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart) workbenchPart; try { new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() { @@ -95,10 +95,11 @@ public class ValidateAction extends Action { */ public static void runValidation(View view) { try { - if(UMLDiagramEditorUtil.openDiagram(view.eResource())) { - IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); - if(editorPart instanceof IDiagramWorkbenchPart) { - runValidation(((IDiagramWorkbenchPart)editorPart).getDiagramEditPart(), view); + if (UMLDiagramEditorUtil.openDiagram(view.eResource())) { + IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .getActiveEditor(); + if (editorPart instanceof IDiagramWorkbenchPart) { + runValidation(((IDiagramWorkbenchPart) editorPart).getDiagramEditPart(), view); } else { runNonUIValidation(view); } @@ -113,10 +114,12 @@ public class ValidateAction extends Action { */ public static void runNonUIValidation(View view) { Shell shell = Display.getCurrent().getActiveShell(); - if(shell == null) { + if (shell == null) { shell = new Shell(); } - DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance().createDiagramEditPart(view.getDiagram(), shell); + + DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance() + .createDiagramEditPart(view.getDiagram(), shell); runValidation(diagramEditPart, view); } @@ -140,7 +143,7 @@ public class ValidateAction extends Action { * @generated */ private static Diagnostic runEMFValidator(View target) { - if(target.isSetElement() && target.getElement() != null) { + if (target.isSetElement() && target.getElement() != null) { return new Diagnostician() { @Override @@ -157,14 +160,15 @@ public class ValidateAction extends Action { */ private static void validate(DiagramEditPart diagramEditPart, View view) { IFile target = view.eResource() != null ? WorkspaceSynchronizer.getFile(view.eResource()) : null; - if(target != null) { + if (target != null) { UMLMarkerNavigationProvider.deleteMarkers(target); } Diagnostic diagnostic = runEMFValidator(view); createMarkers(target, diagnostic, diagramEditPart); - IBatchValidator validator = (IBatchValidator)ModelValidationService.getInstance().newValidator(EvaluationMode.BATCH); + IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance() + .newValidator(EvaluationMode.BATCH); validator.setIncludeLiveConstraints(true); - if(view.isSetElement() && view.getElement() != null) { + if (view.isSetElement() && view.getElement() != null) { IStatus status = validator.validate(view.getElement()); createMarkers(target, status, diagramEditPart); } @@ -174,16 +178,20 @@ public class ValidateAction extends Action { * @generated */ private static void createMarkers(IFile target, IStatus validationStatus, DiagramEditPart diagramEditPart) { - if(validationStatus.isOK()) { + if (validationStatus.isOK()) { return; } final IStatus rootStatus = validationStatus; List allStatuses = new ArrayList(); - UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses)); - for(Iterator it = allStatuses.iterator(); it.hasNext();) { - IConstraintStatus nextStatus = (IConstraintStatus)it.next(); + UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap( + diagramEditPart.getDiagramView(), + collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses)); + for (Iterator it = allStatuses.iterator(); it.hasNext();) { + IConstraintStatus nextStatus = (IConstraintStatus) it.next(); View view = UMLDiagramEditorUtil.findView(diagramEditPart, nextStatus.getTarget(), element2ViewMap); - addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(), nextStatus.getSeverity()); + addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), + EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(), + nextStatus.getSeverity()); } } @@ -191,19 +199,23 @@ public class ValidateAction extends Action { * @generated */ private static void createMarkers(IFile target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) { - if(emfValidationStatus.getSeverity() == Diagnostic.OK) { + if (emfValidationStatus.getSeverity() == Diagnostic.OK) { return; } final Diagnostic rootStatus = emfValidationStatus; List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>(); - UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics)); - for(Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) { + UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap( + diagramEditPart.getDiagramView(), + collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics)); + for (Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) { Diagnostic nextDiagnostic = it.next(); List<?> data = nextDiagnostic.getData(); - if(data != null && !data.isEmpty() && data.get(0) instanceof EObject) { - EObject element = (EObject)data.get(0); + if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) { + EObject element = (EObject) data.get(0); View view = UMLDiagramEditorUtil.findView(diagramEditPart, element, element2ViewMap); - addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity())); + addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), + EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(), + diagnosticToStatusSeverity(nextDiagnostic.getSeverity())); } } } @@ -211,8 +223,9 @@ public class ValidateAction extends Action { /** * @generated */ - private static void addMarker(EditPartViewer viewer, IFile target, String elementId, String location, String message, int statusSeverity) { - if(target == null) { + private static void addMarker(EditPartViewer viewer, IFile target, String elementId, String location, + String message, int statusSeverity) { + if (target == null) { return; } UMLMarkerNavigationProvider.addMarker(target, elementId, location, message, statusSeverity); @@ -222,13 +235,13 @@ public class ValidateAction extends Action { * @generated */ private static int diagnosticToStatusSeverity(int diagnosticSeverity) { - if(diagnosticSeverity == Diagnostic.OK) { + if (diagnosticSeverity == Diagnostic.OK) { return IStatus.OK; - } else if(diagnosticSeverity == Diagnostic.INFO) { + } else if (diagnosticSeverity == Diagnostic.INFO) { return IStatus.INFO; - } else if(diagnosticSeverity == Diagnostic.WARNING) { + } else if (diagnosticSeverity == Diagnostic.WARNING) { return IStatus.WARNING; - } else if(diagnosticSeverity == Diagnostic.ERROR || diagnosticSeverity == Diagnostic.CANCEL) { + } else if (diagnosticSeverity == Diagnostic.ERROR || diagnosticSeverity == Diagnostic.CANCEL) { return IStatus.ERROR; } return IStatus.INFO; @@ -237,14 +250,15 @@ public class ValidateAction extends Action { /** * @generated */ - private static Set<EObject> collectTargetElements(IStatus status, Set<EObject> targetElementCollector, List<IConstraintStatus> allConstraintStatuses) { - if(status instanceof IConstraintStatus) { - targetElementCollector.add(((IConstraintStatus)status).getTarget()); - allConstraintStatuses.add((IConstraintStatus)status); + private static Set<EObject> collectTargetElements(IStatus status, Set<EObject> targetElementCollector, + List<IConstraintStatus> allConstraintStatuses) { + if (status instanceof IConstraintStatus) { + targetElementCollector.add(((IConstraintStatus) status).getTarget()); + allConstraintStatuses.add((IConstraintStatus) status); } - if(status.isMultiStatus()) { + if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); - for(int i = 0; i < children.length; i++) { + for (int i = 0; i < children.length; i++) { collectTargetElements(children[i], targetElementCollector, allConstraintStatuses); } } @@ -254,16 +268,17 @@ public class ValidateAction extends Action { /** * @generated */ - private static Set<EObject> collectTargetElements(Diagnostic diagnostic, Set<EObject> targetElementCollector, List<Diagnostic> allDiagnostics) { + private static Set<EObject> collectTargetElements(Diagnostic diagnostic, Set<EObject> targetElementCollector, + List<Diagnostic> allDiagnostics) { List<?> data = diagnostic.getData(); EObject target = null; - if(data != null && !data.isEmpty() && data.get(0) instanceof EObject) { - target = (EObject)data.get(0); + if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) { + target = (EObject) data.get(0); targetElementCollector.add(target); allDiagnostics.add(diagnostic); } - if(diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) { - for(Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) { + if (diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) { + for (Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) { collectTargetElements(it.next(), targetElementCollector, allDiagnostics); } } 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 20e75af2920..1a398aa51e4 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 @@ -31,6 +31,7 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer DiagramConnectionsPreferencePage.initDefaults(store); DiagramPrintingPreferencePage.initDefaults(store); DiagramRulersAndGridPreferencePage.initDefaults(store); + } /** 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 7cdb007e372..78a4c2a2055 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 @@ -43,13 +43,13 @@ public class ElementInitializers { } /** - * @generated - */ - public void init_Stereotype_1026(Stereotype instance) { + * @generated + */ + public void init_Stereotype_Shape(Stereotype instance) { try { - Object value_0 = name_Stereotype_1026(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Stereotype_Shape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -59,11 +59,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Class_2008(Class instance) { + public void init_Class_Shape(Class instance) { try { - Object value_0 = name_Class_2008(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Class_Shape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -73,11 +73,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Class_1031(Class instance) { + public void init_Class_MetaclassShape(Class instance) { try { - Object value_0 = isAbstract_Class_1031(instance); - if(value_0 != null) { - instance.setIsAbstract(((Boolean)value_0).booleanValue()); + Object value_0 = isAbstract_Class_MetaclassShape(instance); + if (value_0 != null) { + instance.setIsAbstract(((Boolean) value_0).booleanValue()); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -87,11 +87,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Comment_1002(Comment instance) { + public void init_Comment_Shape(Comment instance) { try { - Object value_0 = body_Comment_1002(instance); - if(value_0 != null) { - instance.setBody((String)value_0); + Object value_0 = body_Comment_Shape(instance); + if (value_0 != null) { + instance.setBody((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -99,17 +99,17 @@ public class ElementInitializers { } /** - * @generated - */ - public void init_Constraint_1014(Constraint instance) { + * @generated + */ + public void init_Constraint_PackagedElementShape(Constraint instance) { try { - Object value_0 = name_Constraint_1014(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Constraint_PackagedElementShape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } - Object value_1 = specification_Constraint_1014(instance); - if(value_1 != null) { - instance.setSpecification((ValueSpecification)value_1); + Object value_1 = specification_Constraint_PackagedElementShape(instance); + if (value_1 != null) { + instance.setSpecification((ValueSpecification) value_1); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -119,11 +119,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Model_2005(Model instance) { + public void init_Model_Shape(Model instance) { try { - Object value_0 = name_Model_2005(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Model_Shape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -133,11 +133,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Profile_1030(Profile instance) { + public void init_Profile_Shape(Profile instance) { try { - Object value_0 = name_Profile_1030(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Profile_Shape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -147,11 +147,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Package_2007(Package instance) { + public void init_Package_Shape(Package instance) { try { - Object value_0 = name_Package_2007(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Package_Shape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -161,11 +161,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Enumeration_2006(Enumeration instance) { + public void init_Enumeration_Shape(Enumeration instance) { try { - Object value_0 = name_Enumeration_2006(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Enumeration_Shape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -175,11 +175,11 @@ public class ElementInitializers { /** * @generated */ - public void init_PrimitiveType_2009(PrimitiveType instance) { + public void init_PrimitiveType_Shape(PrimitiveType instance) { try { - Object value_0 = name_PrimitiveType_2009(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_PrimitiveType_Shape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -189,11 +189,11 @@ public class ElementInitializers { /** * @generated */ - public void init_DataType_2010(DataType instance) { + public void init_DataType_Shape(DataType instance) { try { - Object value_0 = name_DataType_2010(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_DataType_Shape(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -203,11 +203,11 @@ public class ElementInitializers { /** * @generated */ - public void init_PrimitiveType_3026(PrimitiveType instance) { + public void init_PrimitiveType_Shape_CN(PrimitiveType instance) { try { - Object value_0 = name_PrimitiveType_3026(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_PrimitiveType_Shape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -217,11 +217,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Operation_3019(Operation instance) { + public void init_Operation_DataTypeOperationLabel(Operation instance) { try { - Object value_0 = name_Operation_3019(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Operation_DataTypeOperationLabel(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -231,11 +231,11 @@ public class ElementInitializers { /** * @generated */ - public void init_EnumerationLiteral_1037(EnumerationLiteral instance) { + public void init_EnumerationLiteral_LiteralLabel(EnumerationLiteral instance) { try { - Object value_0 = name_EnumerationLiteral_1037(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_EnumerationLiteral_LiteralLabel(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -245,11 +245,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Property_3018(Property instance) { + public void init_Property_DataTypeAttributeLabel(Property instance) { try { - Object value_0 = name_Property_3018(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Property_DataTypeAttributeLabel(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -259,11 +259,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Property_3002(Property instance) { + public void init_Property_ClassAttributeLabel(Property instance) { try { - Object value_0 = name_Property_3002(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Property_ClassAttributeLabel(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -273,11 +273,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Operation_3020(Operation instance) { + public void init_Operation_ClassOperationLabel(Operation instance) { try { - Object value_0 = name_Operation_3020(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Operation_ClassOperationLabel(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -287,11 +287,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Stereotype_1023(Stereotype instance) { + public void init_Stereotype_Shape_CN(Stereotype instance) { try { - Object value_0 = name_Stereotype_1023(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Stereotype_Shape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -301,11 +301,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Class_3010(Class instance) { + public void init_Class_Shape_CN(Class instance) { try { - Object value_0 = name_Class_3010(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Class_Shape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -315,11 +315,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Class_3028(Class instance) { + public void init_Class_MetaclassShape_CN(Class instance) { try { - Object value_0 = isAbstract_Class_3028(instance); - if(value_0 != null) { - instance.setIsAbstract(((Boolean)value_0).booleanValue()); + Object value_0 = isAbstract_Class_MetaclassShape_CN(instance); + if (value_0 != null) { + instance.setIsAbstract(((Boolean) value_0).booleanValue()); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -329,11 +329,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Comment_1007(Comment instance) { + public void init_Comment_Shape_CN(Comment instance) { try { - Object value_0 = body_Comment_1007(instance); - if(value_0 != null) { - instance.setBody((String)value_0); + Object value_0 = body_Comment_Shape_CN(instance); + if (value_0 != null) { + instance.setBody((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -343,11 +343,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Model_1027(Model instance) { + public void init_Model_Shape_CN(Model instance) { try { - Object value_0 = name_Model_1027(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Model_Shape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -357,11 +357,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Profile_1024(Profile instance) { + public void init_Profile_Shape_CN(Profile instance) { try { - Object value_0 = name_Profile_1024(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Profile_Shape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -371,11 +371,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Package_1012(Package instance) { + public void init_Package_Shape_CN(Package instance) { try { - Object value_0 = name_Package_1012(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Package_Shape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -383,17 +383,17 @@ public class ElementInitializers { } /** - * @generated - */ - public void init_Constraint_1028(Constraint instance) { + * @generated + */ + public void init_Constraint_PackagedElementShape_CN(Constraint instance) { try { - Object value_0 = name_Constraint_1028(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Constraint_PackagedElementShape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } - Object value_1 = specification_Constraint_1028(instance); - if(value_1 != null) { - instance.setSpecification((ValueSpecification)value_1); + Object value_1 = specification_Constraint_PackagedElementShape_CN(instance); + if (value_1 != null) { + instance.setSpecification((ValueSpecification) value_1); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -403,11 +403,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Enumeration_3025(Enumeration instance) { + public void init_Enumeration_Shape_CN(Enumeration instance) { try { - Object value_0 = name_Enumeration_3025(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Enumeration_Shape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -417,11 +417,11 @@ public class ElementInitializers { /** * @generated */ - public void init_DataType_3027(DataType instance) { + public void init_DataType_Shape_CN(DataType instance) { try { - Object value_0 = name_DataType_3027(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_DataType_Shape_CN(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -431,11 +431,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Association_4001(Association instance) { + public void init_Association_Edge(Association instance) { try { - Object value_0 = name_Association_4001(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Association_Edge(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -445,11 +445,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Dependency_4008(Dependency instance) { + public void init_Dependency_Edge(Dependency instance) { try { - Object value_0 = name_Dependency_4008(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Dependency_Edge(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -459,11 +459,11 @@ public class ElementInitializers { /** * @generated */ - public void init_Dependency_4018(Dependency instance) { + public void init_Dependency_BranchEdge(Dependency instance) { try { - Object value_0 = name_Dependency_4018(instance); - if(value_0 != null) { - instance.setName((String)value_0); + Object value_0 = name_Dependency_BranchEdge(instance); + if (value_0 != null) { + instance.setName((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -473,11 +473,11 @@ public class ElementInitializers { /** * @generated */ - public void init_ElementImport_1064(ElementImport instance) { + public void init_ElementImport_Edge(ElementImport instance) { try { - Object value_0 = alias_ElementImport_1064(instance); - if(value_0 != null) { - instance.setAlias((String)value_0); + Object value_0 = alias_ElementImport_Edge(instance); + if (value_0 != null) { + instance.setAlias((String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -487,21 +487,21 @@ public class ElementInitializers { /** * @generated */ - private String name_Stereotype_1026(Stereotype it) { + private String name_Stereotype_Shape(Stereotype it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Class_2008(Class it) { + private String name_Class_Shape(Class it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private Boolean isAbstract_Class_1031(Class it) { + private Boolean isAbstract_Class_MetaclassShape(Class it) { //isAbstract = true return true; } @@ -509,21 +509,21 @@ public class ElementInitializers { /** * @generated */ - private String body_Comment_1002(Comment it) { + private String body_Comment_Shape(Comment it) { return it.getBody(); } /** - * @generated - */ - private String name_Constraint_1014(Constraint it) { + * @generated + */ + private String name_Constraint_PackagedElementShape(Constraint it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private ValueSpecification specification_Constraint_1014(Constraint it) { + private ValueSpecification specification_Constraint_PackagedElementShape(Constraint it) { LiteralString literalString = UMLFactory.eINSTANCE.createLiteralString(); literalString.setValue(""); return literalString; @@ -532,105 +532,105 @@ public class ElementInitializers { /** * @generated */ - private String name_Model_2005(Model it) { + private String name_Model_Shape(Model it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Profile_1030(Profile it) { + private String name_Profile_Shape(Profile it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Package_2007(Package it) { + private String name_Package_Shape(Package it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Enumeration_2006(Enumeration it) { + private String name_Enumeration_Shape(Enumeration it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_PrimitiveType_2009(PrimitiveType it) { + private String name_PrimitiveType_Shape(PrimitiveType it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_DataType_2010(DataType it) { + private String name_DataType_Shape(DataType it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_PrimitiveType_3026(PrimitiveType it) { + private String name_PrimitiveType_Shape_CN(PrimitiveType it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Operation_3019(Operation it) { + private String name_Operation_DataTypeOperationLabel(Operation it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_EnumerationLiteral_1037(EnumerationLiteral it) { + private String name_EnumerationLiteral_LiteralLabel(EnumerationLiteral it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Property_3018(Property it) { + private String name_Property_DataTypeAttributeLabel(Property it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Property_3002(Property it) { + private String name_Property_ClassAttributeLabel(Property it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Operation_3020(Operation it) { + private String name_Operation_ClassOperationLabel(Operation it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Stereotype_1023(Stereotype it) { + private String name_Stereotype_Shape_CN(Stereotype it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Class_3010(Class it) { + private String name_Class_Shape_CN(Class it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private Boolean isAbstract_Class_3028(Class it) { + private Boolean isAbstract_Class_MetaclassShape_CN(Class it) { //isAbstract = true return true; } @@ -638,42 +638,42 @@ public class ElementInitializers { /** * @generated */ - private String body_Comment_1007(Comment it) { + private String body_Comment_Shape_CN(Comment it) { return it.getBody(); } /** * @generated */ - private String name_Model_1027(Model it) { + private String name_Model_Shape_CN(Model it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Profile_1024(Profile it) { + private String name_Profile_Shape_CN(Profile it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Package_1012(Package it) { + private String name_Package_Shape_CN(Package it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** - * @generated - */ - private String name_Constraint_1028(Constraint it) { + * @generated + */ + private String name_Constraint_PackagedElementShape_CN(Constraint it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private ValueSpecification specification_Constraint_1028(Constraint it) { + private ValueSpecification specification_Constraint_PackagedElementShape_CN(Constraint it) { LiteralString literalString = UMLFactory.eINSTANCE.createLiteralString(); literalString.setValue(""); return literalString; @@ -682,43 +682,43 @@ public class ElementInitializers { /** * @generated */ - private String name_Enumeration_3025(Enumeration it) { + private String name_Enumeration_Shape_CN(Enumeration it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_DataType_3027(DataType it) { + private String name_DataType_Shape_CN(DataType it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Association_4001(Association it) { + private String name_Association_Edge(Association it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Dependency_4008(Dependency it) { + private String name_Dependency_Edge(Dependency it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String name_Dependency_4018(Dependency it) { + private String name_Dependency_BranchEdge(Dependency it) { return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents()); } /** * @generated */ - private String alias_ElementImport_1064(ElementImport it) { - if(it.getImportedElement() != null) { + private String alias_ElementImport_Edge(ElementImport it) { + if (it.getImportedElement() != null) { return (it.getImportedElement().getLabel()); } return "elementimport"; @@ -729,7 +729,7 @@ public class ElementInitializers { */ public static ElementInitializers getInstance() { ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers(); - if(cached == null) { + if (cached == null) { UMLDiagramEditorPlugin.getInstance().setElementInitializers(cached = new ElementInitializers()); } return cached; 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 b508c09b1be..996f13b711c 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 @@ -90,7 +90,8 @@ public class UMLElementTypes { /** * @generated */ - private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); + private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages( + UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); /** * @generated @@ -98,219 +99,260 @@ public class UMLElementTypes { private static Set<IElementType> KNOWN_ELEMENT_TYPES; /** - * @generated - */ - public static final IElementType Profile_1000 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Profile_1000"); //$NON-NLS-1$ + * @generated + */ + public static final IElementType Profile_ProfileDiagram = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Profile_ProfileDiagram"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Dependency_2014 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"); //$NON-NLS-1$ + public static final IElementType Dependency_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Dependency_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Association_2015 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Association_2015"); //$NON-NLS-1$ + public static final IElementType Association_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Association_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Stereotype_1026 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"); //$NON-NLS-1$ + public static final IElementType Stereotype_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Stereotype_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Class_2008 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Class_2008"); //$NON-NLS-1$ + public static final IElementType Class_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Class_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Class_1031 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"); //$NON-NLS-1$ + public static final IElementType Class_MetaclassShape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Class_MetaclassShape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Comment_1002 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Comment_1002"); //$NON-NLS-1$ + public static final IElementType Comment_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Comment_Shape"); //$NON-NLS-1$ /** - * @generated - */ - public static final IElementType Constraint_1014 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Constraint_1014"); //$NON-NLS-1$ + * @generated + */ + public static final IElementType Constraint_PackagedElementShape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Constraint_PackagedElementShape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Model_2005 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Model_2005"); //$NON-NLS-1$ + public static final IElementType Model_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Model_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Profile_1030 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Profile_1030"); //$NON-NLS-1$ + public static final IElementType Profile_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Profile_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Package_2007 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Package_1004"); //$NON-NLS-1$ + public static final IElementType Package_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Package_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Enumeration_2006 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"); //$NON-NLS-1$ + public static final IElementType Enumeration_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Enumeration_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PrimitiveType_2009 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009"); //$NON-NLS-1$ + public static final IElementType PrimitiveType_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.PrimitiveType_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataType_2010 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.DataType_2010"); //$NON-NLS-1$ + public static final IElementType DataType_Shape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.DataType_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Diagram_2016 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Diagram_2016"); //$NON-NLS-1$ + public static final IElementType Diagram_ShortcutShape = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Diagram_ShortcutShape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PrimitiveType_3026 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"); //$NON-NLS-1$ + public static final IElementType PrimitiveType_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Operation_3019 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019"); //$NON-NLS-1$ + public static final IElementType Operation_DataTypeOperationLabel = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType EnumerationLiteral_1037 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037"); //$NON-NLS-1$ + public static final IElementType EnumerationLiteral_LiteralLabel = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Property_3018 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018"); //$NON-NLS-1$ + public static final IElementType Property_DataTypeAttributeLabel = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Property_3002 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002"); //$NON-NLS-1$ + public static final IElementType Property_ClassAttributeLabel = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Property_ClassAttributeLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Operation_3020 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020"); //$NON-NLS-1$ + public static final IElementType Operation_ClassOperationLabel = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Operation_ClassOperationLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Stereotype_1023 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"); //$NON-NLS-1$ + public static final IElementType Stereotype_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Stereotype_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Class_3010 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Class_3010"); //$NON-NLS-1$ + public static final IElementType Class_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Class_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Class_3028 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"); //$NON-NLS-1$ + public static final IElementType Class_MetaclassShape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Class_MetaclassShape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Comment_1007 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"); //$NON-NLS-1$ + public static final IElementType Comment_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Comment_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Model_1027 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Model_1027"); //$NON-NLS-1$ + public static final IElementType Model_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Model_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Profile_1024 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Profile_1024"); //$NON-NLS-1$ + public static final IElementType Profile_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Profile_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Package_1012 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"); //$NON-NLS-1$ + public static final IElementType Package_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Package_Shape_CN"); //$NON-NLS-1$ /** - * @generated - */ - public static final IElementType Constraint_1028 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Constraint_1028"); //$NON-NLS-1$ + * @generated + */ + public static final IElementType Constraint_PackagedElementShape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Enumeration_3025 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025"); //$NON-NLS-1$ + public static final IElementType Enumeration_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Enumeration_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataType_3027 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.DataType_3027"); //$NON-NLS-1$ + public static final IElementType DataType_Shape_CN = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.DataType_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Extension_1013 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Extension_1013"); //$NON-NLS-1$ + public static final IElementType Extension_Edge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Extension_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Association_4001 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Association_4001"); //$NON-NLS-1$ + public static final IElementType Association_Edge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Association_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ProfileApplication_1045 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045"); //$NON-NLS-1$ + public static final IElementType ProfileApplication_Edge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.ProfileApplication_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Association_4019 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Association_4019"); //$NON-NLS-1$ + public static final IElementType Association_BranchEdge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Association_BranchEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Generalization_4002 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Generalization_4002"); //$NON-NLS-1$ + public static final IElementType Generalization_Edge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Generalization_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Dependency_4008 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Dependency_4008"); //$NON-NLS-1$ + public static final IElementType Dependency_Edge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Dependency_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Dependency_4018 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.Dependency_4018"); //$NON-NLS-1$ + public static final IElementType Dependency_BranchEdge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Dependency_BranchEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ElementImport_1064 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064"); //$NON-NLS-1$ + public static final IElementType ElementImport_Edge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.ElementImport_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PackageImport_1065 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065"); //$NON-NLS-1$ + public static final IElementType PackageImport_Edge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.PackageImport_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType CommentAnnotatedElement_1022 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022"); //$NON-NLS-1$ + public static final IElementType Comment_AnnotatedElementEdge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ConstraintConstrainedElement_4014 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014"); //$NON-NLS-1$ + public static final IElementType Constraint_ConstrainedElementEdge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ConstraintContext_8500 = getElementTypeByUniqueId("org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500"); //$NON-NLS-1$ + public static final IElementType Constraint_ContextEdge = getElementTypeByUniqueId( + "org.eclipse.papyrus.umldi.Constraint_ContextEdge"); //$NON-NLS-1$ /** * @generated @@ -347,51 +389,94 @@ public class UMLElementTypes { */ public static synchronized ENamedElement getElement(IAdaptable hint) { Object type = hint.getAdapter(IElementType.class); - if(elements == null) { + if (elements == null) { elements = new IdentityHashMap<IElementType, ENamedElement>(); - elements.put(Profile_1000, UMLPackage.eINSTANCE.getProfile()); - elements.put(Dependency_2014, UMLPackage.eINSTANCE.getDependency()); - elements.put(Association_2015, UMLPackage.eINSTANCE.getAssociation()); - elements.put(Stereotype_1026, UMLPackage.eINSTANCE.getStereotype()); - elements.put(Class_2008, UMLPackage.eINSTANCE.getClass_()); - elements.put(Class_1031, UMLPackage.eINSTANCE.getClass_()); - elements.put(Comment_1002, UMLPackage.eINSTANCE.getComment()); - elements.put(Constraint_1014, UMLPackage.eINSTANCE.getConstraint()); - elements.put(Model_2005, UMLPackage.eINSTANCE.getModel()); - elements.put(Profile_1030, UMLPackage.eINSTANCE.getProfile()); - elements.put(Package_2007, UMLPackage.eINSTANCE.getPackage()); - elements.put(Enumeration_2006, UMLPackage.eINSTANCE.getEnumeration()); - elements.put(PrimitiveType_2009, UMLPackage.eINSTANCE.getPrimitiveType()); - elements.put(DataType_2010, UMLPackage.eINSTANCE.getDataType()); - elements.put(Diagram_2016, NotationPackage.eINSTANCE.getDiagram()); - elements.put(PrimitiveType_3026, UMLPackage.eINSTANCE.getPrimitiveType()); - elements.put(Operation_3019, UMLPackage.eINSTANCE.getOperation()); - elements.put(EnumerationLiteral_1037, UMLPackage.eINSTANCE.getEnumerationLiteral()); - elements.put(Property_3018, UMLPackage.eINSTANCE.getProperty()); - elements.put(Property_3002, UMLPackage.eINSTANCE.getProperty()); - elements.put(Operation_3020, UMLPackage.eINSTANCE.getOperation()); - elements.put(Stereotype_1023, UMLPackage.eINSTANCE.getStereotype()); - elements.put(Class_3010, UMLPackage.eINSTANCE.getClass_()); - elements.put(Class_3028, UMLPackage.eINSTANCE.getClass_()); - elements.put(Comment_1007, UMLPackage.eINSTANCE.getComment()); - elements.put(Model_1027, UMLPackage.eINSTANCE.getModel()); - elements.put(Profile_1024, UMLPackage.eINSTANCE.getProfile()); - elements.put(Package_1012, UMLPackage.eINSTANCE.getPackage()); - elements.put(Constraint_1028, UMLPackage.eINSTANCE.getConstraint()); - elements.put(Enumeration_3025, UMLPackage.eINSTANCE.getEnumeration()); - elements.put(DataType_3027, UMLPackage.eINSTANCE.getDataType()); - elements.put(Extension_1013, UMLPackage.eINSTANCE.getExtension()); - elements.put(Association_4001, UMLPackage.eINSTANCE.getAssociation()); - elements.put(ProfileApplication_1045, UMLPackage.eINSTANCE.getProfileApplication()); - elements.put(Association_4019, UMLPackage.eINSTANCE.getAssociation()); - elements.put(Generalization_4002, UMLPackage.eINSTANCE.getGeneralization()); - elements.put(Dependency_4008, UMLPackage.eINSTANCE.getDependency()); - elements.put(Dependency_4018, UMLPackage.eINSTANCE.getDependency()); - elements.put(ElementImport_1064, UMLPackage.eINSTANCE.getElementImport()); - elements.put(PackageImport_1065, UMLPackage.eINSTANCE.getPackageImport()); - elements.put(CommentAnnotatedElement_1022, UMLPackage.eINSTANCE.getComment_AnnotatedElement()); - elements.put(ConstraintConstrainedElement_4014, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()); - elements.put(ConstraintContext_8500, UMLPackage.eINSTANCE.getConstraint_Context()); + + elements.put(Profile_ProfileDiagram, UMLPackage.eINSTANCE.getProfile()); + + elements.put(Dependency_Shape, UMLPackage.eINSTANCE.getDependency()); + + elements.put(Association_Shape, UMLPackage.eINSTANCE.getAssociation()); + + elements.put(Stereotype_Shape, UMLPackage.eINSTANCE.getStereotype()); + + elements.put(Class_Shape, UMLPackage.eINSTANCE.getClass_()); + + elements.put(Class_MetaclassShape, UMLPackage.eINSTANCE.getClass_()); + + elements.put(Comment_Shape, UMLPackage.eINSTANCE.getComment()); + + elements.put(Constraint_PackagedElementShape, UMLPackage.eINSTANCE.getConstraint()); + + elements.put(Model_Shape, UMLPackage.eINSTANCE.getModel()); + + elements.put(Profile_Shape, UMLPackage.eINSTANCE.getProfile()); + + elements.put(Package_Shape, UMLPackage.eINSTANCE.getPackage()); + + elements.put(Enumeration_Shape, UMLPackage.eINSTANCE.getEnumeration()); + + elements.put(PrimitiveType_Shape, UMLPackage.eINSTANCE.getPrimitiveType()); + + elements.put(DataType_Shape, UMLPackage.eINSTANCE.getDataType()); + + elements.put(Diagram_ShortcutShape, NotationPackage.eINSTANCE.getDiagram()); + + elements.put(PrimitiveType_Shape_CN, UMLPackage.eINSTANCE.getPrimitiveType()); + + elements.put(Operation_DataTypeOperationLabel, UMLPackage.eINSTANCE.getOperation()); + + elements.put(EnumerationLiteral_LiteralLabel, UMLPackage.eINSTANCE.getEnumerationLiteral()); + + elements.put(Property_DataTypeAttributeLabel, UMLPackage.eINSTANCE.getProperty()); + + elements.put(Property_ClassAttributeLabel, UMLPackage.eINSTANCE.getProperty()); + + elements.put(Operation_ClassOperationLabel, UMLPackage.eINSTANCE.getOperation()); + + elements.put(Stereotype_Shape_CN, UMLPackage.eINSTANCE.getStereotype()); + + elements.put(Class_Shape_CN, UMLPackage.eINSTANCE.getClass_()); + + elements.put(Class_MetaclassShape_CN, UMLPackage.eINSTANCE.getClass_()); + + elements.put(Comment_Shape_CN, UMLPackage.eINSTANCE.getComment()); + + elements.put(Model_Shape_CN, UMLPackage.eINSTANCE.getModel()); + + elements.put(Profile_Shape_CN, UMLPackage.eINSTANCE.getProfile()); + + elements.put(Package_Shape_CN, UMLPackage.eINSTANCE.getPackage()); + + elements.put(Constraint_PackagedElementShape_CN, UMLPackage.eINSTANCE.getConstraint()); + + elements.put(Enumeration_Shape_CN, UMLPackage.eINSTANCE.getEnumeration()); + + elements.put(DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType()); + + elements.put(Extension_Edge, UMLPackage.eINSTANCE.getExtension()); + + elements.put(Association_Edge, UMLPackage.eINSTANCE.getAssociation()); + + elements.put(ProfileApplication_Edge, UMLPackage.eINSTANCE.getProfileApplication()); + + elements.put(Association_BranchEdge, UMLPackage.eINSTANCE.getAssociation()); + + elements.put(Generalization_Edge, UMLPackage.eINSTANCE.getGeneralization()); + + elements.put(Dependency_Edge, UMLPackage.eINSTANCE.getDependency()); + + elements.put(Dependency_BranchEdge, UMLPackage.eINSTANCE.getDependency()); + + elements.put(ElementImport_Edge, UMLPackage.eINSTANCE.getElementImport()); + + elements.put(PackageImport_Edge, UMLPackage.eINSTANCE.getPackageImport()); + + elements.put(Comment_AnnotatedElementEdge, UMLPackage.eINSTANCE.getComment_AnnotatedElement()); + + elements.put(Constraint_ConstrainedElementEdge, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()); + + elements.put(Constraint_ContextEdge, UMLPackage.eINSTANCE.getConstraint_Context()); } return elements.get(type); } @@ -407,94 +492,94 @@ public class UMLElementTypes { * @generated */ public static IElementType getElementType(String visualID) { - if(visualID != null) { - switch(visualID) { + if (visualID != null) { + switch (visualID) { case ProfileDiagramEditPart.VISUAL_ID: - return Profile_1000; + return Profile_ProfileDiagram; case DependencyNodeEditPart.VISUAL_ID: - return Dependency_2014; + return Dependency_Shape; case AssociationNodeEditPart.VISUAL_ID: - return Association_2015; + return Association_Shape; case StereotypeEditPart.VISUAL_ID: - return Stereotype_1026; + return Stereotype_Shape; case ClassEditPart.VISUAL_ID: - return Class_2008; + return Class_Shape; case MetaclassEditPart.VISUAL_ID: - return Class_1031; + return Class_MetaclassShape; case CommentEditPart.VISUAL_ID: - return Comment_1002; + return Comment_Shape; case ConstraintEditPart.VISUAL_ID: - return Constraint_1014; + return Constraint_PackagedElementShape; case ModelEditPartTN.VISUAL_ID: - return Model_2005; + return Model_Shape; case ProfileEditPartTN.VISUAL_ID: - return Profile_1030; + return Profile_Shape; case PackageEditPart.VISUAL_ID: - return Package_2007; + return Package_Shape; case EnumerationEditPart.VISUAL_ID: - return Enumeration_2006; + return Enumeration_Shape; case PrimitiveTypeEditPart.VISUAL_ID: - return PrimitiveType_2009; + return PrimitiveType_Shape; case DataTypeEditPart.VISUAL_ID: - return DataType_2010; + return DataType_Shape; case ShortCutDiagramEditPart.VISUAL_ID: - return Diagram_2016; + return Diagram_ShortcutShape; case PrimitiveTypeEditPartCN.VISUAL_ID: - return PrimitiveType_3026; + return PrimitiveType_Shape_CN; case DataTypeOperationEditPart.VISUAL_ID: - return Operation_3019; + return Operation_DataTypeOperationLabel; case EnumerationLiteralEditPart.VISUAL_ID: - return EnumerationLiteral_1037; + return EnumerationLiteral_LiteralLabel; case DataTypePropertyEditPart.VISUAL_ID: - return Property_3018; + return Property_DataTypeAttributeLabel; case ClassPropertyEditPart.VISUAL_ID: - return Property_3002; + return Property_ClassAttributeLabel; case ClassOperationEditPart.VISUAL_ID: - return Operation_3020; + return Operation_ClassOperationLabel; case StereotypeEditPartCN.VISUAL_ID: - return Stereotype_1023; + return Stereotype_Shape_CN; case ClassEditPartCN.VISUAL_ID: - return Class_3010; + return Class_Shape_CN; case MetaclassEditPartCN.VISUAL_ID: - return Class_3028; + return Class_MetaclassShape_CN; case CommentEditPartCN.VISUAL_ID: - return Comment_1007; + return Comment_Shape_CN; case ModelEditPartCN.VISUAL_ID: - return Model_1027; + return Model_Shape_CN; case ProfileEditPartCN.VISUAL_ID: - return Profile_1024; + return Profile_Shape_CN; case PackageEditPartCN.VISUAL_ID: - return Package_1012; + return Package_Shape_CN; case ConstraintEditPartCN.VISUAL_ID: - return Constraint_1028; + return Constraint_PackagedElementShape_CN; case EnumerationEditPartCN.VISUAL_ID: - return Enumeration_3025; + return Enumeration_Shape_CN; case DataTypeEditPartCN.VISUAL_ID: - return DataType_3027; + return DataType_Shape_CN; case ExtensionEditPart.VISUAL_ID: - return Extension_1013; + return Extension_Edge; case AssociationEditPart.VISUAL_ID: - return Association_4001; + return Association_Edge; case ProfileApplicationEditPart.VISUAL_ID: - return ProfileApplication_1045; + return ProfileApplication_Edge; case AssociationBranchEditPart.VISUAL_ID: - return Association_4019; + return Association_BranchEdge; case GeneralizationEditPart.VISUAL_ID: - return Generalization_4002; + return Generalization_Edge; case DependencyEditPart.VISUAL_ID: - return Dependency_4008; + return Dependency_Edge; case DependencyBranchEditPart.VISUAL_ID: - return Dependency_4018; + return Dependency_BranchEdge; case ElementImportEditPart.VISUAL_ID: - return ElementImport_1064; + return ElementImport_Edge; case PackageImportEditPart.VISUAL_ID: - return PackageImport_1065; + return PackageImport_Edge; case CommentAnnotatedElementEditPart.VISUAL_ID: - return CommentAnnotatedElement_1022; + return Comment_AnnotatedElementEdge; case ConstraintConstrainedElementEditPart.VISUAL_ID: - return ConstraintConstrainedElement_4014; + return Constraint_ConstrainedElementEdge; case ContextLinkEditPart.VISUAL_ID: - return ConstraintContext_8500; + return Constraint_ContextEdge; } } return null; @@ -504,59 +589,62 @@ public class UMLElementTypes { * @generated */ public static synchronized boolean isKnownElementType(IElementType elementType) { - if(KNOWN_ELEMENT_TYPES == null) { + if (KNOWN_ELEMENT_TYPES == null) { KNOWN_ELEMENT_TYPES = new HashSet<IElementType>(); - KNOWN_ELEMENT_TYPES.add(Profile_1000); - KNOWN_ELEMENT_TYPES.add(Dependency_2014); - KNOWN_ELEMENT_TYPES.add(Association_2015); - KNOWN_ELEMENT_TYPES.add(Stereotype_1026); - KNOWN_ELEMENT_TYPES.add(Class_2008); - KNOWN_ELEMENT_TYPES.add(Class_1031); - KNOWN_ELEMENT_TYPES.add(Comment_1002); - KNOWN_ELEMENT_TYPES.add(Constraint_1014); - KNOWN_ELEMENT_TYPES.add(Model_2005); - KNOWN_ELEMENT_TYPES.add(Profile_1030); - KNOWN_ELEMENT_TYPES.add(Package_2007); - KNOWN_ELEMENT_TYPES.add(Enumeration_2006); - KNOWN_ELEMENT_TYPES.add(PrimitiveType_2009); - KNOWN_ELEMENT_TYPES.add(DataType_2010); - KNOWN_ELEMENT_TYPES.add(Diagram_2016); - KNOWN_ELEMENT_TYPES.add(PrimitiveType_3026); - KNOWN_ELEMENT_TYPES.add(Operation_3019); - KNOWN_ELEMENT_TYPES.add(EnumerationLiteral_1037); - KNOWN_ELEMENT_TYPES.add(Property_3018); - KNOWN_ELEMENT_TYPES.add(Property_3002); - KNOWN_ELEMENT_TYPES.add(Operation_3020); - KNOWN_ELEMENT_TYPES.add(Stereotype_1023); - KNOWN_ELEMENT_TYPES.add(Class_3010); - KNOWN_ELEMENT_TYPES.add(Class_3028); - KNOWN_ELEMENT_TYPES.add(Comment_1007); - KNOWN_ELEMENT_TYPES.add(Model_1027); - KNOWN_ELEMENT_TYPES.add(Profile_1024); - KNOWN_ELEMENT_TYPES.add(Package_1012); - KNOWN_ELEMENT_TYPES.add(Constraint_1028); - KNOWN_ELEMENT_TYPES.add(Enumeration_3025); - KNOWN_ELEMENT_TYPES.add(DataType_3027); - KNOWN_ELEMENT_TYPES.add(Extension_1013); - KNOWN_ELEMENT_TYPES.add(Association_4001); - KNOWN_ELEMENT_TYPES.add(ProfileApplication_1045); - KNOWN_ELEMENT_TYPES.add(Association_4019); - KNOWN_ELEMENT_TYPES.add(Generalization_4002); - KNOWN_ELEMENT_TYPES.add(Dependency_4008); - KNOWN_ELEMENT_TYPES.add(Dependency_4018); - KNOWN_ELEMENT_TYPES.add(ElementImport_1064); - KNOWN_ELEMENT_TYPES.add(PackageImport_1065); - KNOWN_ELEMENT_TYPES.add(CommentAnnotatedElement_1022); - KNOWN_ELEMENT_TYPES.add(ConstraintConstrainedElement_4014); - KNOWN_ELEMENT_TYPES.add(ConstraintContext_8500); + KNOWN_ELEMENT_TYPES.add(Profile_ProfileDiagram); + KNOWN_ELEMENT_TYPES.add(Dependency_Shape); + KNOWN_ELEMENT_TYPES.add(Association_Shape); + KNOWN_ELEMENT_TYPES.add(Stereotype_Shape); + KNOWN_ELEMENT_TYPES.add(Class_Shape); + KNOWN_ELEMENT_TYPES.add(Class_MetaclassShape); + KNOWN_ELEMENT_TYPES.add(Comment_Shape); + KNOWN_ELEMENT_TYPES.add(Constraint_PackagedElementShape); + KNOWN_ELEMENT_TYPES.add(Model_Shape); + KNOWN_ELEMENT_TYPES.add(Profile_Shape); + KNOWN_ELEMENT_TYPES.add(Package_Shape); + KNOWN_ELEMENT_TYPES.add(Enumeration_Shape); + KNOWN_ELEMENT_TYPES.add(PrimitiveType_Shape); + KNOWN_ELEMENT_TYPES.add(DataType_Shape); + KNOWN_ELEMENT_TYPES.add(Diagram_ShortcutShape); + KNOWN_ELEMENT_TYPES.add(PrimitiveType_Shape_CN); + KNOWN_ELEMENT_TYPES.add(Operation_DataTypeOperationLabel); + KNOWN_ELEMENT_TYPES.add(EnumerationLiteral_LiteralLabel); + KNOWN_ELEMENT_TYPES.add(Property_DataTypeAttributeLabel); + KNOWN_ELEMENT_TYPES.add(Property_ClassAttributeLabel); + KNOWN_ELEMENT_TYPES.add(Operation_ClassOperationLabel); + KNOWN_ELEMENT_TYPES.add(Stereotype_Shape_CN); + KNOWN_ELEMENT_TYPES.add(Class_Shape_CN); + KNOWN_ELEMENT_TYPES.add(Class_MetaclassShape_CN); + KNOWN_ELEMENT_TYPES.add(Comment_Shape_CN); + KNOWN_ELEMENT_TYPES.add(Model_Shape_CN); + KNOWN_ELEMENT_TYPES.add(Profile_Shape_CN); + KNOWN_ELEMENT_TYPES.add(Package_Shape_CN); + KNOWN_ELEMENT_TYPES.add(Constraint_PackagedElementShape_CN); + KNOWN_ELEMENT_TYPES.add(Enumeration_Shape_CN); + KNOWN_ELEMENT_TYPES.add(DataType_Shape_CN); + KNOWN_ELEMENT_TYPES.add(Extension_Edge); + KNOWN_ELEMENT_TYPES.add(Association_Edge); + KNOWN_ELEMENT_TYPES.add(ProfileApplication_Edge); + KNOWN_ELEMENT_TYPES.add(Association_BranchEdge); + KNOWN_ELEMENT_TYPES.add(Generalization_Edge); + KNOWN_ELEMENT_TYPES.add(Dependency_Edge); + KNOWN_ELEMENT_TYPES.add(Dependency_BranchEdge); + KNOWN_ELEMENT_TYPES.add(ElementImport_Edge); + KNOWN_ELEMENT_TYPES.add(PackageImport_Edge); + KNOWN_ELEMENT_TYPES.add(Comment_AnnotatedElementEdge); + KNOWN_ELEMENT_TYPES.add(Constraint_ConstrainedElementEdge); + KNOWN_ELEMENT_TYPES.add(Constraint_ContextEdge); } + boolean result = KNOWN_ELEMENT_TYPES.contains(elementType); - if(!result) { + + if (!result) { IElementType[] supertypes = elementType.getAllSuperTypes(); - for(int i = 0; !result && (i < supertypes.length); i++) { + for (int i = 0; !result && (i < supertypes.length); i++) { result = KNOWN_ELEMENT_TYPES.contains(supertypes[i]); } } + return result; } @@ -595,12 +683,14 @@ public class UMLElementTypes { */ public static boolean isKindOf(IElementType subtype, IElementType supertype) { boolean result = subtype == supertype; - if(!result) { + + if (!result) { IElementType[] supertypes = subtype.getAllSuperTypes(); - for(int i = 0; !result && (i < supertypes.length); i++) { + for (int i = 0; !result && (i < supertypes.length); i++) { result = supertype == supertypes[i]; } } + return result; } } 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 da53a67a94a..8b4b09a5255 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 @@ -42,18 +42,18 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr @Override protected void doGotoMarker(IMarker marker) { String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null); - if(elementId == null || !(getEditor() instanceof DiagramEditor)) { + if (elementId == null || !(getEditor() instanceof DiagramEditor)) { return; } - DiagramEditor editor = (DiagramEditor)getEditor(); + DiagramEditor editor = (DiagramEditor) getEditor(); Map<?, ?> editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry(); EObject targetView = editor.getDiagram().eResource().getEObject(elementId); - if(targetView == null) { + if (targetView == null) { return; } - EditPart targetEditPart = (EditPart)editPartRegistry.get(targetView); - if(targetEditPart != null) { - UMLDiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[]{ targetEditPart })); + EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView); + if (targetEditPart != null) { + UMLDiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[] { targetEditPart })); } } @@ -79,9 +79,9 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr marker.setAttribute(IMarker.LOCATION, location); marker.setAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, elementId); int markerSeverity = IMarker.SEVERITY_INFO; - if(statusSeverity == IStatus.WARNING) { + if (statusSeverity == IStatus.WARNING) { markerSeverity = IMarker.SEVERITY_WARNING; - } else if(statusSeverity == IStatus.ERROR || statusSeverity == IStatus.CANCEL) { + } else if (statusSeverity == IStatus.ERROR || statusSeverity == IStatus.CANCEL) { markerSeverity = IMarker.SEVERITY_ERROR; } marker.setAttribute(IMarker.SEVERITY, markerSeverity); 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 c2b4a7b6bcf..b6158a1ddd2 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 @@ -82,849 +82,879 @@ import org.eclipse.uml2.uml.UMLPackage; public class UMLParserProvider extends AbstractProvider implements IParserProvider { /** - * @generated - */ - private IParser dependencyName_1Parser; + * @generated + */ + private IParser dependency_MultiNameLabel_Parser; /** * @generated */ - private IParser getDependencyName_1Parser() { - if(dependencyName_1Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getDependency_MultiNameLabel_Parser() { + if (dependency_MultiNameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - dependencyName_1Parser = parser; + dependency_MultiNameLabel_Parser = parser; } - return dependencyName_1Parser; + return dependency_MultiNameLabel_Parser; } /** * @generated */ - private IParser stereotypeName_1034Parser; + private IParser stereotype_NameLabel_Parser; /** * @generated */ - private IParser getStereotypeName_1034Parser() { - if(stereotypeName_1034Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getStereotype_NameLabel_Parser() { + if (stereotype_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - stereotypeName_1034Parser = parser; + stereotype_NameLabel_Parser = parser; } - return stereotypeName_1034Parser; + return stereotype_NameLabel_Parser; } /** * @generated */ - private IParser className_5029Parser; + private IParser class_NameLabel_Parser; /** * @generated */ - private IParser getClassName_5029Parser() { - if(className_5029Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getClass_NameLabel_Parser() { + if (class_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - className_5029Parser = parser; + class_NameLabel_Parser = parser; } - return className_5029Parser; + return class_NameLabel_Parser; } /** * @generated */ - private IParser className_1084Parser; + private IParser class_MetaclassNameLabel_Parser; /** * @generated */ - private IParser getClassName_1084Parser() { - if(className_1084Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getClass_MetaclassNameLabel_Parser() { + if (class_MetaclassNameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - className_1084Parser = parser; + class_MetaclassNameLabel_Parser = parser; } - return className_1084Parser; + return class_MetaclassNameLabel_Parser; } /** * @generated */ - private CommentParser commentBody_3Parser; + private CommentParser comment_BodyLabel_Parser; /** * @generated */ - private IParser getCommentBody_3Parser() { - if(commentBody_3Parser == null) { - commentBody_3Parser = new CommentParser(); + private IParser getComment_BodyLabel_Parser() { + if (comment_BodyLabel_Parser == null) { + comment_BodyLabel_Parser = new CommentParser(); } - return commentBody_3Parser; + return comment_BodyLabel_Parser; } /** * @generated */ - private IParser constraintName_1015Parser; + private IParser constraint_NameLabel_Parser; /** * @generated */ - private IParser getConstraintName_1015Parser() { - if(constraintName_1015Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getConstraint_NameLabel_Parser() { + if (constraint_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - constraintName_1015Parser = parser; + constraint_NameLabel_Parser = parser; } - return constraintName_1015Parser; + return constraint_NameLabel_Parser; } /** * @generated */ - private ConstraintParser constraintSpecification_5063Parser; + private ConstraintParser constraint_BodyLabel_Parser; /** * @generated */ - private IParser getConstraintSpecification_5063Parser() { - if(constraintSpecification_5063Parser == null) { - constraintSpecification_5063Parser = new ConstraintParser(); + private IParser getConstraint_BodyLabel_Parser() { + if (constraint_BodyLabel_Parser == null) { + constraint_BodyLabel_Parser = new ConstraintParser(); } - return constraintSpecification_5063Parser; + return constraint_BodyLabel_Parser; } /** * @generated */ - private IParser modelName_5020Parser; + private IParser model_NameLabel_Parser; /** * @generated */ - private IParser getModelName_5020Parser() { - if(modelName_5020Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getModel_NameLabel_Parser() { + if (model_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - modelName_5020Parser = parser; + model_NameLabel_Parser = parser; } - return modelName_5020Parser; + return model_NameLabel_Parser; } /** * @generated */ - private IParser profileName_1047Parser; + private IParser profile_NameLabel_Parser; /** * @generated */ - private IParser getProfileName_1047Parser() { - if(profileName_1047Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getProfile_NameLabel_Parser() { + if (profile_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - profileName_1047Parser = parser; + profile_NameLabel_Parser = parser; } - return profileName_1047Parser; + return profile_NameLabel_Parser; } /** * @generated */ - private IParser packageName_5026Parser; + private IParser package_NameLabel_Parser; /** * @generated */ - private IParser getPackageName_5026Parser() { - if(packageName_5026Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getPackage_NameLabel_Parser() { + if (package_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - packageName_5026Parser = parser; + package_NameLabel_Parser = parser; } - return packageName_5026Parser; + return package_NameLabel_Parser; } /** * @generated */ - private IParser enumerationName_5023Parser; + private IParser enumeration_NameLabel_Parser; /** * @generated */ - private IParser getEnumerationName_5023Parser() { - if(enumerationName_5023Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getEnumeration_NameLabel_Parser() { + if (enumeration_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - enumerationName_5023Parser = parser; + enumeration_NameLabel_Parser = parser; } - return enumerationName_5023Parser; + return enumeration_NameLabel_Parser; } /** * @generated */ - private IParser primitiveTypeName_5032Parser; + private IParser primitiveType_NameLabel_Parser; /** * @generated */ - private IParser getPrimitiveTypeName_5032Parser() { - if(primitiveTypeName_5032Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getPrimitiveType_NameLabel_Parser() { + if (primitiveType_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - primitiveTypeName_5032Parser = parser; + primitiveType_NameLabel_Parser = parser; } - return primitiveTypeName_5032Parser; + return primitiveType_NameLabel_Parser; } /** * @generated */ - private IParser dataTypeName_5035Parser; + private IParser dataType_NameLabel_Parser; /** * @generated */ - private IParser getDataTypeName_5035Parser() { - if(dataTypeName_5035Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getDataType_NameLabel_Parser() { + if (dataType_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - dataTypeName_5035Parser = parser; + dataType_NameLabel_Parser = parser; } - return dataTypeName_5035Parser; + return dataType_NameLabel_Parser; } /** * @generated */ - private IParser diagramName_2Parser; + private IParser diagram_NameLabel_Parser; /** * @generated */ - private IParser getDiagramName_2Parser() { - if(diagramName_2Parser == null) { - EAttribute[] features = new EAttribute[]{ NotationPackage.eINSTANCE.getDiagram_Name() }; + private IParser getDiagram_NameLabel_Parser() { + if (diagram_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { NotationPackage.eINSTANCE.getDiagram_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - diagramName_2Parser = parser; + diagram_NameLabel_Parser = parser; } - return diagramName_2Parser; + return diagram_NameLabel_Parser; } /** * @generated */ - private IParser primitiveTypeName_5058Parser; + private IParser primitiveType_NameLabel_CN_Parser; /** * @generated */ - private IParser getPrimitiveTypeName_5058Parser() { - if(primitiveTypeName_5058Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getPrimitiveType_NameLabel_CN_Parser() { + if (primitiveType_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - primitiveTypeName_5058Parser = parser; + primitiveType_NameLabel_CN_Parser = parser; } - return primitiveTypeName_5058Parser; + return primitiveType_NameLabel_CN_Parser; } /** * @generated */ - private IParser operation_3019Parser; + private IParser operation_DataTypeOperationLabel_Parser; /** * @generated */ - private IParser getOperation_3019Parser() { - if(operation_3019Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getOperation_DataTypeOperationLabel_Parser() { + if (operation_DataTypeOperationLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - operation_3019Parser = parser; + operation_DataTypeOperationLabel_Parser = parser; } - return operation_3019Parser; + return operation_DataTypeOperationLabel_Parser; } /** * @generated */ - private IParser enumerationLiteral_1037Parser; + private IParser enumerationLiteral_LiteralLabel_Parser; /** * @generated */ - private IParser getEnumerationLiteral_1037Parser() { - if(enumerationLiteral_1037Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getEnumerationLiteral_LiteralLabel_Parser() { + if (enumerationLiteral_LiteralLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - enumerationLiteral_1037Parser = parser; + enumerationLiteral_LiteralLabel_Parser = parser; } - return enumerationLiteral_1037Parser; + return enumerationLiteral_LiteralLabel_Parser; } /** * @generated */ - private IParser property_3018Parser; + private IParser property_DataTypeAttributeLabel_Parser; /** * @generated */ - private IParser getProperty_3018Parser() { - if(property_3018Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getProperty_DataTypeAttributeLabel_Parser() { + if (property_DataTypeAttributeLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - property_3018Parser = parser; + property_DataTypeAttributeLabel_Parser = parser; } - return property_3018Parser; + return property_DataTypeAttributeLabel_Parser; } /** * @generated */ - private IParser property_3002Parser; + private IParser property_ClassAttributeLabel_Parser; /** * @generated */ - private IParser getProperty_3002Parser() { - if(property_3002Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getProperty_ClassAttributeLabel_Parser() { + if (property_ClassAttributeLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - property_3002Parser = parser; + property_ClassAttributeLabel_Parser = parser; } - return property_3002Parser; + return property_ClassAttributeLabel_Parser; } /** * @generated */ - private IParser operation_3020Parser; + private IParser operation_ClassOperationLabel_Parser; /** * @generated */ - private IParser getOperation_3020Parser() { - if(operation_3020Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getOperation_ClassOperationLabel_Parser() { + if (operation_ClassOperationLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - operation_3020Parser = parser; + operation_ClassOperationLabel_Parser = parser; } - return operation_3020Parser; + return operation_ClassOperationLabel_Parser; } /** * @generated */ - private IParser stereotypeName_1046Parser; + private IParser stereotype_NameLabel_CN_Parser; /** * @generated */ - private IParser getStereotypeName_1046Parser() { - if(stereotypeName_1046Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getStereotype_NameLabel_CN_Parser() { + if (stereotype_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - stereotypeName_1046Parser = parser; + stereotype_NameLabel_CN_Parser = parser; } - return stereotypeName_1046Parser; + return stereotype_NameLabel_CN_Parser; } /** * @generated */ - private IParser className_5014Parser; + private IParser class_NameLabel_CN_Parser; /** * @generated */ - private IParser getClassName_5014Parser() { - if(className_5014Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getClass_NameLabel_CN_Parser() { + if (class_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - className_5014Parser = parser; + class_NameLabel_CN_Parser = parser; } - return className_5014Parser; + return class_NameLabel_CN_Parser; } /** * @generated */ - private IParser className_5062Parser; + private IParser class_MetaclassNameLabel_CN_Parser; /** * @generated */ - private IParser getClassName_5062Parser() { - if(className_5062Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getClass_MetaclassNameLabel_CN_Parser() { + if (class_MetaclassNameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - className_5062Parser = parser; + class_MetaclassNameLabel_CN_Parser = parser; } - return className_5062Parser; + return class_MetaclassNameLabel_CN_Parser; } /** * @generated */ - private CommentParser commentBody_1008Parser; + private CommentParser comment_BodyLabel_CN_Parser; /** * @generated */ - private IParser getCommentBody_1008Parser() { - if(commentBody_1008Parser == null) { - commentBody_1008Parser = new CommentParser(); + private IParser getComment_BodyLabel_CN_Parser() { + if (comment_BodyLabel_CN_Parser == null) { + comment_BodyLabel_CN_Parser = new CommentParser(); } - return commentBody_1008Parser; + return comment_BodyLabel_CN_Parser; } /** * @generated */ - private IParser modelName_1056Parser; + private IParser model_NameLabel_CN_Parser; /** * @generated */ - private IParser getModelName_1056Parser() { - if(modelName_1056Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getModel_NameLabel_CN_Parser() { + if (model_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - modelName_1056Parser = parser; + model_NameLabel_CN_Parser = parser; } - return modelName_1056Parser; + return model_NameLabel_CN_Parser; } /** * @generated */ - private IParser profileName_1050Parser; + private IParser profile_NameLabel_CN_Parser; /** * @generated */ - private IParser getProfileName_1050Parser() { - if(profileName_1050Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getProfile_NameLabel_CN_Parser() { + if (profile_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - profileName_1050Parser = parser; + profile_NameLabel_CN_Parser = parser; } - return profileName_1050Parser; + return profile_NameLabel_CN_Parser; } /** * @generated */ - private IParser packageName_1010Parser; + private IParser package_NameLabel_CN_Parser; /** * @generated */ - private IParser getPackageName_1010Parser() { - if(packageName_1010Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getPackage_NameLabel_CN_Parser() { + if (package_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - packageName_1010Parser = parser; + package_NameLabel_CN_Parser = parser; } - return packageName_1010Parser; + return package_NameLabel_CN_Parser; } /** * @generated */ - private IParser constraintName_1059Parser; + private IParser constraint_NameLabel_CN_Parser; /** * @generated */ - private IParser getConstraintName_1059Parser() { - if(constraintName_1059Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getConstraint_NameLabel_CN_Parser() { + if (constraint_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - constraintName_1059Parser = parser; + constraint_NameLabel_CN_Parser = parser; } - return constraintName_1059Parser; + return constraint_NameLabel_CN_Parser; } /** * @generated */ - private ConstraintParser constraintSpecification_5064Parser; + private ConstraintParser constraint_BodyLabel_CN_Parser; /** * @generated */ - private IParser getConstraintSpecification_5064Parser() { - if(constraintSpecification_5064Parser == null) { - constraintSpecification_5064Parser = new ConstraintParser(); + private IParser getConstraint_BodyLabel_CN_Parser() { + if (constraint_BodyLabel_CN_Parser == null) { + constraint_BodyLabel_CN_Parser = new ConstraintParser(); } - return constraintSpecification_5064Parser; + return constraint_BodyLabel_CN_Parser; } /** * @generated */ - private IParser enumerationName_5055Parser; + private IParser enumeration_NameLabel_CN_Parser; /** * @generated */ - private IParser getEnumerationName_5055Parser() { - if(enumerationName_5055Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getEnumeration_NameLabel_CN_Parser() { + if (enumeration_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - enumerationName_5055Parser = parser; + enumeration_NameLabel_CN_Parser = parser; } - return enumerationName_5055Parser; + return enumeration_NameLabel_CN_Parser; } /** * @generated */ - private IParser dataTypeName_5061Parser; + private IParser dataType_NameLabel_CN_Parser; /** * @generated */ - private IParser getDataTypeName_5061Parser() { - if(dataTypeName_5061Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getDataType_NameLabel_CN_Parser() { + if (dataType_NameLabel_CN_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - dataTypeName_5061Parser = parser; + dataType_NameLabel_CN_Parser = parser; } - return dataTypeName_5061Parser; + return dataType_NameLabel_CN_Parser; } /** * @generated */ - private AppliedStereotypeParser associationName_6001Parser; + private AppliedStereotypeParser association_StereotypeLabel_Parser; /** * @generated */ - private IParser getAssociationName_6001Parser() { - if(associationName_6001Parser == null) { - associationName_6001Parser = new AppliedStereotypeParser(); + private IParser getAssociation_StereotypeLabel_Parser() { + if (association_StereotypeLabel_Parser == null) { + association_StereotypeLabel_Parser = new AppliedStereotypeParser(); } - return associationName_6001Parser; + return association_StereotypeLabel_Parser; } /** * @generated */ - private IParser associationName_6002Parser; + private IParser association_NameLabel_Parser; /** * @generated */ - private IParser getAssociationName_6002Parser() { - if(associationName_6002Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getAssociation_NameLabel_Parser() { + if (association_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - associationName_6002Parser = parser; + association_NameLabel_Parser = parser; } - return associationName_6002Parser; + return association_NameLabel_Parser; } /** * @generated */ - private IParser associationName_6003Parser; + private IParser association_TargetRoleLabel_Parser; /** * @generated */ - private IParser getAssociationName_6003Parser() { - if(associationName_6003Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getAssociation_TargetRoleLabel_Parser() { + if (association_TargetRoleLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcRole{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcRole{0}"); //$NON-NLS-1$ parser.setEditPattern("srcRole{0}"); //$NON-NLS-1$ - associationName_6003Parser = parser; + association_TargetRoleLabel_Parser = parser; } - return associationName_6003Parser; + return association_TargetRoleLabel_Parser; } /** * @generated */ - private IParser associationName_6005Parser; + private IParser association_SourceRoleLabel_Parser; /** * @generated */ - private IParser getAssociationName_6005Parser() { - if(associationName_6005Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getAssociation_SourceRoleLabel_Parser() { + if (association_SourceRoleLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("targMul{0}"); //$NON-NLS-1$ parser.setEditorPattern("targMul{0}"); //$NON-NLS-1$ parser.setEditPattern("targMul{0}"); //$NON-NLS-1$ - associationName_6005Parser = parser; + association_SourceRoleLabel_Parser = parser; } - return associationName_6005Parser; + return association_SourceRoleLabel_Parser; } /** * @generated */ - private IParser associationName_6033Parser; + private IParser association_SourceMultiplicityLabel_Parser; /** * @generated */ - private IParser getAssociationName_6033Parser() { - if(associationName_6033Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getAssociation_SourceMultiplicityLabel_Parser() { + if (association_SourceMultiplicityLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcMul{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcMul{0}"); //$NON-NLS-1$ parser.setEditPattern("srcMul{0}"); //$NON-NLS-1$ - associationName_6033Parser = parser; + association_SourceMultiplicityLabel_Parser = parser; } - return associationName_6033Parser; + return association_SourceMultiplicityLabel_Parser; } /** * @generated */ - private IParser associationName_6034Parser; + private IParser association_TargetMultiplicityLabel_Parser; /** * @generated */ - private IParser getAssociationName_6034Parser() { - if(associationName_6034Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getAssociation_TargetMultiplicityLabel_Parser() { + if (association_TargetMultiplicityLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcMul{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcMul{0}"); //$NON-NLS-1$ parser.setEditPattern("srcMul{0}"); //$NON-NLS-1$ - associationName_6034Parser = parser; + association_TargetMultiplicityLabel_Parser = parser; } - return associationName_6034Parser; + return association_TargetMultiplicityLabel_Parser; } /** * @generated */ - private IParser associationName_6035Parser; + private IParser association_BranchMultiplicityLabel_Parser; /** * @generated */ - private IParser getAssociationName_6035Parser() { - if(associationName_6035Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getAssociation_BranchMultiplicityLabel_Parser() { + if (association_BranchMultiplicityLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcRole{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcRole{0}"); //$NON-NLS-1$ parser.setEditPattern("srcRole{0}"); //$NON-NLS-1$ - associationName_6035Parser = parser; + association_BranchMultiplicityLabel_Parser = parser; } - return associationName_6035Parser; + return association_BranchMultiplicityLabel_Parser; } /** * @generated */ - private IParser generalizationIsSubstitutable_6007Parser; + private IParser generalization_StereotypeLabel_Parser; /** * @generated */ - private IParser getGeneralizationIsSubstitutable_6007Parser() { - if(generalizationIsSubstitutable_6007Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getGeneralization_IsSubstitutable() }; + private IParser getGeneralization_StereotypeLabel_Parser() { + if (generalization_StereotypeLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getGeneralization_IsSubstitutable() }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("<<{0}>>"); //$NON-NLS-1$ parser.setEditorPattern("<<{0}>>"); //$NON-NLS-1$ parser.setEditPattern("<<{0}>>"); //$NON-NLS-1$ - generalizationIsSubstitutable_6007Parser = parser; + generalization_StereotypeLabel_Parser = parser; } - return generalizationIsSubstitutable_6007Parser; + return generalization_StereotypeLabel_Parser; } /** * @generated */ - private IParser dependencyName_6026Parser; + private IParser dependency_NameLabel_Parser; /** * @generated */ - private IParser getDependencyName_6026Parser() { - if(dependencyName_6026Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() }; + private IParser getDependency_NameLabel_Parser() { + if (dependency_NameLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; MessageFormatParser parser = new MessageFormatParser(features); - dependencyName_6026Parser = parser; + dependency_NameLabel_Parser = parser; } - return dependencyName_6026Parser; + return dependency_NameLabel_Parser; } /** * @generated */ - private AppliedStereotypeParser dependencyName_6027Parser; + private AppliedStereotypeParser dependency_StereotypeLabel_Parser; /** * @generated */ - private IParser getDependencyName_6027Parser() { - if(dependencyName_6027Parser == null) { - dependencyName_6027Parser = new AppliedStereotypeParser(); + private IParser getDependency_StereotypeLabel_Parser() { + if (dependency_StereotypeLabel_Parser == null) { + dependency_StereotypeLabel_Parser = new AppliedStereotypeParser(); } - return dependencyName_6027Parser; + return dependency_StereotypeLabel_Parser; } /** * @generated */ - private IParser elementImportAlias_6020Parser; + private IParser elementImport_AliasLabel_Parser; /** * @generated */ - private IParser getElementImportAlias_6020Parser() { - if(elementImportAlias_6020Parser == null) { - EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getElementImport_Alias() }; + private IParser getElementImport_AliasLabel_Parser() { + if (elementImport_AliasLabel_Parser == null) { + EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getElementImport_Alias() }; MessageFormatParser parser = new MessageFormatParser(features); - elementImportAlias_6020Parser = parser; + elementImport_AliasLabel_Parser = parser; } - return elementImportAlias_6020Parser; + return elementImport_AliasLabel_Parser; } /** * @generated */ - private AppliedStereotypeParser elementImportAlias_6021Parser; + private AppliedStereotypeParser elementImport_StereotypeLabel_Parser; /** * @generated */ - private IParser getElementImportAlias_6021Parser() { - if(elementImportAlias_6021Parser == null) { - elementImportAlias_6021Parser = new AppliedStereotypeParser(); + private IParser getElementImport_StereotypeLabel_Parser() { + if (elementImport_StereotypeLabel_Parser == null) { + elementImport_StereotypeLabel_Parser = new AppliedStereotypeParser(); } - return elementImportAlias_6021Parser; + return elementImport_StereotypeLabel_Parser; } /** * @generated */ - private PackageImportVisibilityParser packageImportVisibility_6022Parser; + private PackageImportVisibilityParser packageImport_StereotypeLabel_Parser; /** * @generated */ - private IParser getPackageImportVisibility_6022Parser() { - if(packageImportVisibility_6022Parser == null) { - packageImportVisibility_6022Parser = new PackageImportVisibilityParser(); + private IParser getPackageImport_StereotypeLabel_Parser() { + if (packageImport_StereotypeLabel_Parser == null) { + packageImport_StereotypeLabel_Parser = new PackageImportVisibilityParser(); } - return packageImportVisibility_6022Parser; + return packageImport_StereotypeLabel_Parser; } /** * @generated */ protected IParser getParser(String visualID) { - if(visualID != null) { - switch(visualID) { + if (visualID != null) { + switch (visualID) { case MultiDependencyLabelEditPart.VISUAL_ID: - return getDependencyName_1Parser(); + return getDependency_MultiNameLabel_Parser(); + case StereotypeNameEditPart.VISUAL_ID: - return getStereotypeName_1034Parser(); + return getStereotype_NameLabel_Parser(); + case ClassNameEditPart.VISUAL_ID: - return getClassName_5029Parser(); + return getClass_NameLabel_Parser(); + case MetaclassNameEditPart.VISUAL_ID: - return getClassName_1084Parser(); + return getClass_MetaclassNameLabel_Parser(); + case CommentBodyEditPart.VISUAL_ID: - return getCommentBody_3Parser(); + return getComment_BodyLabel_Parser(); + case ConstraintNameEditPart.VISUAL_ID: - return getConstraintName_1015Parser(); + return getConstraint_NameLabel_Parser(); case ConstraintBodyEditPart.VISUAL_ID: - return getConstraintSpecification_5063Parser(); + return getConstraint_BodyLabel_Parser(); + case ModelNameEditPart.VISUAL_ID: - return getModelName_5020Parser(); + return getModel_NameLabel_Parser(); + case ProfileNameEditPartTN.VISUAL_ID: - return getProfileName_1047Parser(); + return getProfile_NameLabel_Parser(); + case PackageNameEditPart.VISUAL_ID: - return getPackageName_5026Parser(); + return getPackage_NameLabel_Parser(); + case EnumerationNameEditPart.VISUAL_ID: - return getEnumerationName_5023Parser(); + return getEnumeration_NameLabel_Parser(); + case PrimitiveTypeNameEditPart.VISUAL_ID: - return getPrimitiveTypeName_5032Parser(); + return getPrimitiveType_NameLabel_Parser(); + case DataTypeNameEditPart.VISUAL_ID: - return getDataTypeName_5035Parser(); + return getDataType_NameLabel_Parser(); + case DiagramNameEditPart.VISUAL_ID: - return getDiagramName_2Parser(); + return getDiagram_NameLabel_Parser(); + case PrimitiveTypeNameEditPartCN.VISUAL_ID: - return getPrimitiveTypeName_5058Parser(); + return getPrimitiveType_NameLabel_CN_Parser(); + case DataTypeOperationEditPart.VISUAL_ID: - return getOperation_3019Parser(); + return getOperation_DataTypeOperationLabel_Parser(); case EnumerationLiteralEditPart.VISUAL_ID: - return getEnumerationLiteral_1037Parser(); + return getEnumerationLiteral_LiteralLabel_Parser(); case DataTypePropertyEditPart.VISUAL_ID: - return getProperty_3018Parser(); + return getProperty_DataTypeAttributeLabel_Parser(); case ClassPropertyEditPart.VISUAL_ID: - return getProperty_3002Parser(); + return getProperty_ClassAttributeLabel_Parser(); case ClassOperationEditPart.VISUAL_ID: - return getOperation_3020Parser(); + return getOperation_ClassOperationLabel_Parser(); case StereotypeNameEditPartCN.VISUAL_ID: - return getStereotypeName_1046Parser(); + return getStereotype_NameLabel_CN_Parser(); + case ClassNameEditPartCN.VISUAL_ID: - return getClassName_5014Parser(); + return getClass_NameLabel_CN_Parser(); + case MetaclassNameEditPartCN.VISUAL_ID: - return getClassName_5062Parser(); + return getClass_MetaclassNameLabel_CN_Parser(); + case CommentBodyEditPartCN.VISUAL_ID: - return getCommentBody_1008Parser(); + return getComment_BodyLabel_CN_Parser(); + case ModelNameEditPartCN.VISUAL_ID: - return getModelName_1056Parser(); + return getModel_NameLabel_CN_Parser(); + case ProfileNameEditPartCN.VISUAL_ID: - return getProfileName_1050Parser(); + return getProfile_NameLabel_CN_Parser(); + case PackageNameEditPartCN.VISUAL_ID: - return getPackageName_1010Parser(); + return getPackage_NameLabel_CN_Parser(); + case ConstraintNameEditPartCN.VISUAL_ID: - return getConstraintName_1059Parser(); + return getConstraint_NameLabel_CN_Parser(); case ConstraintBodyEditPartCN.VISUAL_ID: - return getConstraintSpecification_5064Parser(); + return getConstraint_BodyLabel_CN_Parser(); + case EnumerationNameEditPartCN.VISUAL_ID: - return getEnumerationName_5055Parser(); + return getEnumeration_NameLabel_CN_Parser(); + case DataTypeNameEditPartCN.VISUAL_ID: - return getDataTypeName_5061Parser(); + return getDataType_NameLabel_CN_Parser(); + case AssociationAppliedStereotypeEditPart.VISUAL_ID: - return getAssociationName_6001Parser(); + return getAssociation_StereotypeLabel_Parser(); case AssociationNameEditPart.VISUAL_ID: - return getAssociationName_6002Parser(); + return getAssociation_NameLabel_Parser(); case AssociationRoleTargetEditPart.VISUAL_ID: - return getAssociationName_6003Parser(); + return getAssociation_TargetRoleLabel_Parser(); case AssociationRoleSourceEditPart.VISUAL_ID: - return getAssociationName_6005Parser(); + return getAssociation_SourceRoleLabel_Parser(); case AssociationMultiplicitySourceEditPart.VISUAL_ID: - return getAssociationName_6033Parser(); + return getAssociation_SourceMultiplicityLabel_Parser(); case AssociationMultiplicityTargetEditPart.VISUAL_ID: - return getAssociationName_6034Parser(); + return getAssociation_TargetMultiplicityLabel_Parser(); + case AssociationBranchMultiplicityEditPart.VISUAL_ID: - return getAssociationName_6035Parser(); + return getAssociation_BranchMultiplicityLabel_Parser(); + case GeneralizationAppliedStereotypeEditPart.VISUAL_ID: - return getGeneralizationIsSubstitutable_6007Parser(); + return getGeneralization_StereotypeLabel_Parser(); + case DependencyNameEditPart.VISUAL_ID: - return getDependencyName_6026Parser(); + return getDependency_NameLabel_Parser(); case DependencyAppliedStereotypeEditPart.VISUAL_ID: - return getDependencyName_6027Parser(); + return getDependency_StereotypeLabel_Parser(); + case ElementImportAliasEditPart.VISUAL_ID: - return getElementImportAlias_6020Parser(); + return getElementImport_AliasLabel_Parser(); case AppliedStereotypeElementImportEditPart.VISUAL_ID: - return getElementImportAlias_6021Parser(); + return getElementImport_StereotypeLabel_Parser(); + case PackageImportAppliedStereotypeEditPart.VISUAL_ID: - return getPackageImportVisibility_6022Parser(); + return getPackageImport_StereotypeLabel_Parser(); + } } return null; @@ -943,12 +973,12 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid * @generated */ public IParser getParser(IAdaptable hint) { - String vid = (String)hint.getAdapter(String.class); - if(vid != null) { + String vid = (String) hint.getAdapter(String.class); + if (vid != null) { return getParser(UMLVisualIDRegistry.getVisualID(vid)); } - View view = (View)hint.getAdapter(View.class); - if(view != null) { + View view = (View) hint.getAdapter(View.class); + if (view != null) { return getParser(UMLVisualIDRegistry.getVisualID(view)); } return null; @@ -958,9 +988,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid * @generated */ public boolean provides(IOperation operation) { - if(operation instanceof GetParserOperation) { - IAdaptable hint = ((GetParserOperation)operation).getHint(); - if(UMLElementTypes.getElement(hint) == null) { + if (operation instanceof GetParserOperation) { + IAdaptable hint = ((GetParserOperation) operation).getHint(); + if (UMLElementTypes.getElement(hint) == null) { return false; } return getParser(hint) != null; @@ -992,7 +1022,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { - if(IElementType.class.equals(adapter)) { + if (IElementType.class.equals(adapter)) { return elementType; } return super.getAdapter(adapter); 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 57ba2fcc1ed..5bbf75d8f1e 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 @@ -37,20 +37,20 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider */ @Override public void createDecorators(IDecoratorTarget decoratorTarget) { - EditPart editPart = (EditPart)decoratorTarget.getAdapter(EditPart.class); - if(editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) { + EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class); + if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) { Object model = editPart.getModel(); - if((model instanceof View)) { - View view = (View)model; - if(!(view instanceof Edge) && !view.isSetElement()) { + if ((model instanceof View)) { + View view = (View) model; + if (!(view instanceof Edge) && !view.isSetElement()) { return; } } EditDomain ed = editPart.getViewer().getEditDomain(); - if(!(ed instanceof DiagramEditDomain)) { + if (!(ed instanceof DiagramEditDomain)) { return; } - if(((DiagramEditDomain)ed).getEditorPart() instanceof UMLDiagramEditor) { + if (((DiagramEditDomain) ed).getEditorPart() instanceof UMLDiagramEditor) { decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget)); } } @@ -61,11 +61,11 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider */ @Override public boolean provides(IOperation operation) { - if(!(operation instanceof CreateDecoratorsOperation)) { + if (!(operation instanceof CreateDecoratorsOperation)) { return false; } - IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation)operation).getDecoratorTarget(); - View view = (View)decoratorTarget.getAdapter(View.class); + IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget(); + View view = (View) decoratorTarget.getAdapter(View.class); return view != null && ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view)); } } 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 ebb4570e5be..7190e7e5b97 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 @@ -40,7 +40,6 @@ public class UMLValidationProvider { public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) { final Runnable op = operation; Runnable task = new Runnable() { - @Override public void run() { try { @@ -51,7 +50,7 @@ public class UMLValidationProvider { } } }; - if(editingDomain != null) { + if (editingDomain != null) { try { editingDomain.runExclusive(task); } catch (Exception e) { @@ -66,11 +65,12 @@ public class UMLValidationProvider { * @generated */ static boolean isInDefaultEditorContext(Object object) { - if(shouldConstraintsBePrivate() && !constraintsActive) { + if (shouldConstraintsBePrivate() && !constraintsActive) { return false; } - if(object instanceof View) { - return constraintsActive && ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View)object)); + if (object instanceof View) { + return constraintsActive + && ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object)); } return true; } 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 74b061dde52..00a72fd0fb7 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 @@ -71,16 +71,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { * @generated */ public final boolean provides(IOperation operation) { - if(operation instanceof CreateViewForKindOperation) { - return provides((CreateViewForKindOperation)operation); + if (operation instanceof CreateViewForKindOperation) { + return provides((CreateViewForKindOperation) operation); } assert operation instanceof CreateViewOperation; - if(operation instanceof CreateDiagramViewOperation) { - return provides((CreateDiagramViewOperation)operation); - } else if(operation instanceof CreateEdgeViewOperation) { - return provides((CreateEdgeViewOperation)operation); - } else if(operation instanceof CreateNodeViewOperation) { - return provides((CreateNodeViewOperation)operation); + if (operation instanceof CreateDiagramViewOperation) { + return provides((CreateDiagramViewOperation) operation); + } else if (operation instanceof CreateEdgeViewOperation) { + return provides((CreateEdgeViewOperation) operation); + } else if (operation instanceof CreateNodeViewOperation) { + return provides((CreateNodeViewOperation) operation); } return false; } @@ -95,15 +95,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { if (op.getViewKind() == Edge.class) return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; */ + // check Diagram Type should be the class diagram String modelID = UMLVisualIDRegistry.getModelID(op.getContainerView()); - if(!getDiagramProvidedId().equals(modelID)) { + if (!getDiagramProvidedId().equals(modelID)) { return false; } + String visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint()); - if(Node.class.isAssignableFrom(op.getViewKind())) { + if (Node.class.isAssignableFrom(op.getViewKind())) { return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID); } + return true; } @@ -126,46 +129,49 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { * @generated */ protected boolean provides(CreateDiagramViewOperation op) { - return ProfileDiagramEditPart.MODEL_ID.equals(op.getSemanticHint()) && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null; + return ProfileDiagramEditPart.MODEL_ID.equals(op.getSemanticHint()) + && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null; } /** * @generated */ protected boolean provides(CreateNodeViewOperation op) { - if(op.getContainerView() == null) { + if (op.getContainerView() == null) { return false; } IElementType elementType = getSemanticElementType(op.getSemanticAdapter()); EObject domainElement = getSemanticElement(op.getSemanticAdapter()); String visualID; - if(op.getSemanticHint() == null) { + if (op.getSemanticHint() == null) { // Semantic hint is not specified. Can be a result of call from CanonicalEditPolicy. // In this situation there should be NO elementType, visualID will be determined // by VisualIDRegistry.getNodeVisualID() for domainElement. - if(elementType != null || domainElement == null) { + if (elementType != null || domainElement == null) { return false; } visualID = UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement); } else { visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint()); - if(elementType != null) { - if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) { + if (elementType != null) { + + if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) { return false; // foreign element type } - String elementTypeHint = ((IHintedType)elementType).getSemanticHint(); - if(!op.getSemanticHint().equals(elementTypeHint)) { + + String elementTypeHint = ((IHintedType) elementType).getSemanticHint(); + if (!op.getSemanticHint().equals(elementTypeHint)) { return false; // if semantic hint is specified it should be the same as in element type } //if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) { // return false; // visual id for node EClass should match visual id from element type //} } else { - if(!ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) { + if (!ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) { return false; // foreign diagram } - if(visualID != null) { - switch(visualID) { + if (visualID != null) { + switch (visualID) { case DependencyNodeEditPart.VISUAL_ID: case AssociationNodeEditPart.VISUAL_ID: case StereotypeEditPart.VISUAL_ID: @@ -196,7 +202,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case ProfileEditPartCN.VISUAL_ID: case EnumerationEditPartCN.VISUAL_ID: case DataTypeEditPartCN.VISUAL_ID: - if(domainElement == null || !visualID.equals(UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) { + if (domainElement == null || !visualID + .equals(UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) { return false; // visual id in semantic hint should match visual id for domain element } break; @@ -206,6 +213,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { } } } + return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID); } @@ -215,13 +223,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { protected boolean provides(CreateEdgeViewOperation op) { IElementType elementType = getSemanticElementType(op.getSemanticAdapter()); //RS: add code for extended types creation - if(elementType instanceof IExtendedHintedElementType) { + if (elementType instanceof IExtendedHintedElementType) { IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType); - if(!UMLElementTypes.isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof IHintedType))) { + if (!UMLElementTypes.isKnownElementType(closestNonExtendedType) + || (!(closestNonExtendedType instanceof IHintedType))) { return false; // foreign element type. } } else { - if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) { + if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) { return false; // foreign element type } } @@ -229,8 +238,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { // return false; // foreign element type //} // END R.S. - String elementTypeHint = ((IHintedType)elementType).getSemanticHint(); - if(elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) { + String elementTypeHint = ((IHintedType) elementType).getSemanticHint(); + if (elementTypeHint == null + || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) { return false; // our hint is visual id and must be specified, and it should be the same as in element type } //String visualID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getVisualID(elementTypeHint); @@ -258,76 +268,84 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, + boolean persisted, PreferencesHint preferencesHint) { final EObject domainElement = getSemanticElement(semanticAdapter); final String visualID; - if(semanticHint == null) { + if (semanticHint == null) { visualID = UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement); } else { visualID = UMLVisualIDRegistry.getVisualID(semanticHint); } - if(visualID != null) { - switch(visualID) { + if (visualID != null) { + switch (visualID) { case DependencyNodeEditPart.VISUAL_ID: - return createDependency_2014(domainElement, containerView, index, persisted, preferencesHint); + return createDependency_Shape(domainElement, containerView, index, persisted, preferencesHint); case AssociationNodeEditPart.VISUAL_ID: - return createAssociation_2015(domainElement, containerView, index, persisted, preferencesHint); + return createAssociation_Shape(domainElement, containerView, index, persisted, preferencesHint); case StereotypeEditPart.VISUAL_ID: - return createStereotype_1026(domainElement, containerView, index, persisted, preferencesHint); + return createStereotype_Shape(domainElement, containerView, index, persisted, preferencesHint); case ClassEditPart.VISUAL_ID: - return createClass_2008(domainElement, containerView, index, persisted, preferencesHint); + return createClass_Shape(domainElement, containerView, index, persisted, preferencesHint); case MetaclassEditPart.VISUAL_ID: - return createClass_1031(domainElement, containerView, index, persisted, preferencesHint); + return createClass_MetaclassShape(domainElement, containerView, index, persisted, preferencesHint); case CommentEditPart.VISUAL_ID: - return createComment_1002(domainElement, containerView, index, persisted, preferencesHint); + return createComment_Shape(domainElement, containerView, index, persisted, preferencesHint); case ConstraintEditPart.VISUAL_ID: - return createConstraint_1014(domainElement, containerView, index, persisted, preferencesHint); + return createConstraint_PackagedElementShape(domainElement, containerView, index, persisted, + preferencesHint); case ModelEditPartTN.VISUAL_ID: - return createModel_2005(domainElement, containerView, index, persisted, preferencesHint); + return createModel_Shape(domainElement, containerView, index, persisted, preferencesHint); case ProfileEditPartTN.VISUAL_ID: - return createProfile_1030(domainElement, containerView, index, persisted, preferencesHint); + return createProfile_Shape(domainElement, containerView, index, persisted, preferencesHint); case PackageEditPart.VISUAL_ID: - return createPackage_2007(domainElement, containerView, index, persisted, preferencesHint); + return createPackage_Shape(domainElement, containerView, index, persisted, preferencesHint); case EnumerationEditPart.VISUAL_ID: - return createEnumeration_2006(domainElement, containerView, index, persisted, preferencesHint); + return createEnumeration_Shape(domainElement, containerView, index, persisted, preferencesHint); case PrimitiveTypeEditPart.VISUAL_ID: - return createPrimitiveType_2009(domainElement, containerView, index, persisted, preferencesHint); + return createPrimitiveType_Shape(domainElement, containerView, index, persisted, preferencesHint); case DataTypeEditPart.VISUAL_ID: - return createDataType_2010(domainElement, containerView, index, persisted, preferencesHint); + return createDataType_Shape(domainElement, containerView, index, persisted, preferencesHint); case ShortCutDiagramEditPart.VISUAL_ID: - return createDiagram_2016(domainElement, containerView, index, persisted, preferencesHint); + return createDiagram_ShortcutShape(domainElement, containerView, index, persisted, preferencesHint); case PrimitiveTypeEditPartCN.VISUAL_ID: - return createPrimitiveType_3026(domainElement, containerView, index, persisted, preferencesHint); + return createPrimitiveType_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case DataTypeOperationEditPart.VISUAL_ID: - return createOperation_3019(domainElement, containerView, index, persisted, preferencesHint); + return createOperation_DataTypeOperationLabel(domainElement, containerView, index, persisted, + preferencesHint); case EnumerationLiteralEditPart.VISUAL_ID: - return createEnumerationLiteral_1037(domainElement, containerView, index, persisted, preferencesHint); + return createEnumerationLiteral_LiteralLabel(domainElement, containerView, index, persisted, + preferencesHint); case DataTypePropertyEditPart.VISUAL_ID: - return createProperty_3018(domainElement, containerView, index, persisted, preferencesHint); + return createProperty_DataTypeAttributeLabel(domainElement, containerView, index, persisted, + preferencesHint); case ClassPropertyEditPart.VISUAL_ID: - return createProperty_3002(domainElement, containerView, index, persisted, preferencesHint); + return createProperty_ClassAttributeLabel(domainElement, containerView, index, persisted, + preferencesHint); case ClassOperationEditPart.VISUAL_ID: - return createOperation_3020(domainElement, containerView, index, persisted, preferencesHint); + return createOperation_ClassOperationLabel(domainElement, containerView, index, persisted, + preferencesHint); case StereotypeEditPartCN.VISUAL_ID: - return createStereotype_1023(domainElement, containerView, index, persisted, preferencesHint); + return createStereotype_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case ClassEditPartCN.VISUAL_ID: - return createClass_3010(domainElement, containerView, index, persisted, preferencesHint); + return createClass_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case MetaclassEditPartCN.VISUAL_ID: - return createClass_3028(domainElement, containerView, index, persisted, preferencesHint); + return createClass_MetaclassShape_CN(domainElement, containerView, index, persisted, preferencesHint); case CommentEditPartCN.VISUAL_ID: - return createComment_1007(domainElement, containerView, index, persisted, preferencesHint); + return createComment_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case ModelEditPartCN.VISUAL_ID: - return createModel_1027(domainElement, containerView, index, persisted, preferencesHint); + return createModel_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case ProfileEditPartCN.VISUAL_ID: - return createProfile_1024(domainElement, containerView, index, persisted, preferencesHint); + return createProfile_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case PackageEditPartCN.VISUAL_ID: - return createPackage_1012(domainElement, containerView, index, persisted, preferencesHint); + return createPackage_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case ConstraintEditPartCN.VISUAL_ID: - return createConstraint_1028(domainElement, containerView, index, persisted, preferencesHint); + return createConstraint_PackagedElementShape_CN(domainElement, containerView, index, persisted, + preferencesHint); case EnumerationEditPartCN.VISUAL_ID: - return createEnumeration_3025(domainElement, containerView, index, persisted, preferencesHint); + return createEnumeration_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case DataTypeEditPartCN.VISUAL_ID: - return createDataType_3027(domainElement, containerView, index, persisted, preferencesHint); + return createDataType_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); } } // can't happen, provided #provides(CreateNodeViewOperation) is correct @@ -337,36 +355,46 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, + boolean persisted, PreferencesHint preferencesHint) { IElementType elementType = getSemanticElementType(semanticAdapter); - String elementTypeHint = ((IHintedType)elementType).getSemanticHint(); + String elementTypeHint = ((IHintedType) elementType).getSemanticHint(); String vid = UMLVisualIDRegistry.getVisualID(elementTypeHint); - if(vid != null) { - switch(vid) { + if (vid != null) { + switch (vid) { case ExtensionEditPart.VISUAL_ID: - return createExtension_1013(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createExtension_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, + preferencesHint); case AssociationEditPart.VISUAL_ID: - return createAssociation_4001(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createAssociation_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, + preferencesHint); case ProfileApplicationEditPart.VISUAL_ID: - return createProfileApplication_1045(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createProfileApplication_Edge(getSemanticElement(semanticAdapter), containerView, index, + persisted, preferencesHint); case AssociationBranchEditPart.VISUAL_ID: - return createAssociation_4019(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createAssociation_BranchEdge(getSemanticElement(semanticAdapter), containerView, index, + persisted, preferencesHint); case GeneralizationEditPart.VISUAL_ID: - return createGeneralization_4002(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createGeneralization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, + preferencesHint); case DependencyEditPart.VISUAL_ID: - return createDependency_4008(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createDependency_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, + preferencesHint); case DependencyBranchEditPart.VISUAL_ID: - return createDependency_4018(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createDependency_BranchEdge(getSemanticElement(semanticAdapter), containerView, index, persisted, + preferencesHint); case ElementImportEditPart.VISUAL_ID: - return createElementImport_1064(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createElementImport_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, + preferencesHint); case PackageImportEditPart.VISUAL_ID: - return createPackageImport_1065(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); + return createPackageImport_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, + preferencesHint); case CommentAnnotatedElementEditPart.VISUAL_ID: - return createCommentAnnotatedElement_1022(containerView, index, persisted, preferencesHint); + return createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint); case ConstraintConstrainedElementEditPart.VISUAL_ID: - return createConstraintConstrainedElement_4014(containerView, index, persisted, preferencesHint); + return createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint); case ContextLinkEditPart.VISUAL_ID: - return createConstraintContext_8500(containerView, index, persisted, preferencesHint); + return createConstraint_ContextEdge(containerView, index, persisted, preferencesHint); } } // can never happen, provided #provides(CreateEdgeViewOperation) is correct @@ -376,7 +404,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createDependency_2014(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createDependency_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(DependencyNodeEditPart.VISUAL_ID)); @@ -384,20 +413,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Dependency"); - Node label1 = createLabel(node, UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID)); - label1.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location1 = (Location)label1.getLayoutConstraint(); - location1.setX(0); - location1.setY(5); + Node dependency_MultiNameLabel = createLabel(node, + UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID)); + dependency_MultiNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location dependency_MultiNameLabel_Location = (Location) dependency_MultiNameLabel.getLayoutConstraint(); + dependency_MultiNameLabel_Location.setX(0); + dependency_MultiNameLabel_Location.setY(5); return node; } /** * @generated */ - public Node createAssociation_2015(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createAssociation_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(AssociationNodeEditPart.VISUAL_ID)); @@ -405,7 +437,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "AssociationNode"); return node; } @@ -413,7 +446,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createStereotype_1026(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createStereotype_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(StereotypeEditPart.VISUAL_ID)); @@ -421,11 +455,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Stereotype"); - Node label1034 = createLabel(node, UMLVisualIDRegistry.getType(StereotypeNameEditPart.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(StereotypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(StereotypeOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); + Node stereotype_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(StereotypeNameEditPart.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(StereotypeAttributeCompartmentEditPart.VISUAL_ID), true, + true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(StereotypeOperationCompartmentEditPart.VISUAL_ID), true, + true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Stereotype"); return node; } @@ -433,7 +470,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createClass_2008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createClass_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ClassEditPart.VISUAL_ID)); @@ -441,11 +479,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class"); - Node label5029 = createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); + Node class_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID), true, true, + true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID), true, true, + true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class"); return node; } @@ -453,7 +494,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createClass_1031(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createClass_MetaclassShape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(MetaclassEditPart.VISUAL_ID)); @@ -461,16 +503,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Metaclass"); - Node label1084 = createLabel(node, UMLVisualIDRegistry.getType(MetaclassNameEditPart.VISUAL_ID)); + Node class_MetaclassNameLabel = createLabel(node, UMLVisualIDRegistry.getType(MetaclassNameEditPart.VISUAL_ID)); return node; } /** * @generated */ - public Node createComment_1002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createComment_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(CommentEditPart.VISUAL_ID)); @@ -478,16 +522,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment"); - Node label3 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID)); + Node comment_BodyLabel = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID)); return node; } /** * @generated */ - public Node createConstraint_1014(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createConstraint_PackagedElementShape(EObject domainElement, View containerView, int index, + boolean persisted, PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ConstraintEditPart.VISUAL_ID)); @@ -495,17 +541,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint"); - Node label1015 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID)); - Node label5063 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintBodyEditPart.VISUAL_ID)); + Node constraint_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID)); + Node constraint_BodyLabel = createLabel(node, UMLVisualIDRegistry.getType(ConstraintBodyEditPart.VISUAL_ID)); return node; } /** * @generated */ - public Node createModel_2005(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createModel_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ModelEditPartTN.VISUAL_ID)); @@ -513,10 +561,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Model"); - Node label5020 = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPart.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartTN.VISUAL_ID), false, true, false, false); + Node model_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPart.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartTN.VISUAL_ID), + false, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Model"); return node; } @@ -524,7 +574,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createProfile_1030(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createProfile_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ProfileEditPartTN.VISUAL_ID)); @@ -532,10 +583,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Profile"); - Node label1047 = createLabel(node, UMLVisualIDRegistry.getType(ProfileNameEditPartTN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID), false, true, false, false); + Node profile_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ProfileNameEditPartTN.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID), + false, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Profile"); return node; } @@ -543,7 +596,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createPackage_2007(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createPackage_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(PackageEditPart.VISUAL_ID)); @@ -551,10 +605,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package"); - Node label5026 = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID), false, true, false, false); + Node package_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID), + false, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package"); return node; } @@ -562,7 +618,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createEnumeration_2006(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createEnumeration_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(EnumerationEditPart.VISUAL_ID)); @@ -570,10 +627,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration"); - Node label5023 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), true, true, true, true); + Node enumeration_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), + true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration"); return node; } @@ -581,7 +640,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createPrimitiveType_2009(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createPrimitiveType_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(PrimitiveTypeEditPart.VISUAL_ID)); @@ -589,16 +649,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType"); - Node label5032 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID)); + Node primitiveType_NameLabel = createLabel(node, + UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID)); return node; } /** * @generated */ - public Node createDataType_2010(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createDataType_Shape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(DataTypeEditPart.VISUAL_ID)); @@ -606,11 +669,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType"); - Node label5035 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); + Node dataType_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, + true, true); + createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID), true, true, + true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType"); return node; } @@ -618,7 +684,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createDiagram_2016(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createDiagram_ShortcutShape(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ShortCutDiagramEditPart.VISUAL_ID)); @@ -626,13 +693,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); stampShortcut(containerView, node); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ShortCutDiagram"); - Node label2 = createLabel(node, UMLVisualIDRegistry.getType(DiagramNameEditPart.VISUAL_ID)); - label2.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location2 = (Location)label2.getLayoutConstraint(); - location2.setX(0); - location2.setY(5); + Node diagram_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DiagramNameEditPart.VISUAL_ID)); + diagram_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location diagram_NameLabel_Location = (Location) diagram_NameLabel.getLayoutConstraint(); + diagram_NameLabel_Location.setX(0); + diagram_NameLabel_Location.setY(5); PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(node, prefStore, "ShortCutDiagram"); return node; } @@ -640,29 +708,34 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createPrimitiveType_3026(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createPrimitiveType_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(PrimitiveTypeEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType"); - Node label5058 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID)); + Node primitiveType_NameLabel_CN = createLabel(node, + UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID)); return node; } /** * @generated */ - public Node createOperation_3019(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createOperation_DataTypeOperationLabel(EObject domainElement, View containerView, int index, + boolean persisted, PreferencesHint preferencesHint) { Node node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); node.setType(UMLVisualIDRegistry.getType(DataTypeOperationEditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Operation"); return node; } @@ -670,13 +743,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createEnumerationLiteral_1037(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createEnumerationLiteral_LiteralLabel(EObject domainElement, View containerView, int index, + boolean persisted, PreferencesHint preferencesHint) { Node node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); node.setType(UMLVisualIDRegistry.getType(EnumerationLiteralEditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "EnumerationLiteral"); return node; } @@ -684,13 +759,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createProperty_3018(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createProperty_DataTypeAttributeLabel(EObject domainElement, View containerView, int index, + boolean persisted, PreferencesHint preferencesHint) { Node node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); node.setType(UMLVisualIDRegistry.getType(DataTypePropertyEditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property"); return node; } @@ -698,13 +775,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createProperty_3002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createProperty_ClassAttributeLabel(EObject domainElement, View containerView, int index, + boolean persisted, PreferencesHint preferencesHint) { Node node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); node.setType(UMLVisualIDRegistry.getType(ClassPropertyEditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property"); return node; } @@ -712,13 +791,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createOperation_3020(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createOperation_ClassOperationLabel(EObject domainElement, View containerView, int index, + boolean persisted, PreferencesHint preferencesHint) { Node node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); node.setType(UMLVisualIDRegistry.getType(ClassOperationEditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Operation"); return node; } @@ -726,18 +807,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createStereotype_1023(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createStereotype_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(StereotypeEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Stereotype"); - Node label1046 = createLabel(node, UMLVisualIDRegistry.getType(StereotypeNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(StereotypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(StereotypeOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + Node stereotype_NameLabel_CN = createLabel(node, + UMLVisualIDRegistry.getType(StereotypeNameEditPartCN.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(StereotypeAttributeCompartmentEditPartCN.VISUAL_ID), true, + true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(StereotypeOperationCompartmentEditPartCN.VISUAL_ID), true, + true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Stereotype"); return node; } @@ -745,18 +831,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createClass_3010(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createClass_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ClassEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class"); - Node label5014 = createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + Node class_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPartCN.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID), true, true, + true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID), true, true, + true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class"); return node; } @@ -764,49 +854,57 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createClass_3028(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createClass_MetaclassShape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(MetaclassEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Metaclass"); - Node label5062 = createLabel(node, UMLVisualIDRegistry.getType(MetaclassNameEditPartCN.VISUAL_ID)); + Node class_MetaclassNameLabel_CN = createLabel(node, + UMLVisualIDRegistry.getType(MetaclassNameEditPartCN.VISUAL_ID)); return node; } /** * @generated */ - public Node createComment_1007(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createComment_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(CommentEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment"); - Node label1008 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID)); + Node comment_BodyLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID)); return node; } /** * @generated */ - public Node createModel_1027(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createModel_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ModelEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Model"); - Node label1056 = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartCN.VISUAL_ID), false, true, false, false); + Node model_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartCN.VISUAL_ID), + false, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Model"); return node; } @@ -814,17 +912,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createProfile_1024(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createProfile_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ProfileEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Profile"); - Node label1050 = createLabel(node, UMLVisualIDRegistry.getType(ProfileNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID), false, true, false, false); + Node profile_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ProfileNameEditPartCN.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID), + false, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Profile"); return node; } @@ -832,17 +933,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createPackage_1012(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createPackage_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(PackageEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package"); - Node label1010 = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID), false, true, false, false); + Node package_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID), + false, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package"); return node; } @@ -850,34 +954,43 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createConstraint_1028(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createConstraint_PackagedElementShape_CN(EObject domainElement, View containerView, int index, + boolean persisted, PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(ConstraintEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint"); - Node label1059 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID)); - Node label5064 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintBodyEditPartCN.VISUAL_ID)); + Node constraint_NameLabel_CN = createLabel(node, + UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID)); + Node constraint_BodyLabel_CN = createLabel(node, + UMLVisualIDRegistry.getType(ConstraintBodyEditPartCN.VISUAL_ID)); return node; } /** * @generated */ - public Node createEnumeration_3025(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createEnumeration_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(EnumerationEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration"); - Node label5055 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + Node enumeration_NameLabel_CN = createLabel(node, + UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID)); + createCompartment(node, + UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, + true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration"); return node; } @@ -885,18 +998,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Node createDataType_3027(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createDataType_Shape_CN(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(UMLVisualIDRegistry.getType(DataTypeEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); // initializeFromPreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType"); - Node label5061 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + Node dataType_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID)); + createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, + true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID), true, + true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType"); return node; } @@ -904,7 +1021,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Edge createExtension_1013(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createExtension_Edge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -917,19 +1035,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(ExtensionEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Extension"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} + return edge; } /** * @generated */ - public Edge createAssociation_4001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createAssociation_Edge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -942,42 +1063,51 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(AssociationEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Association"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} - Node label6001 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationAppliedStereotypeEditPart.VISUAL_ID)); - label6001.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6001 = (Location)label6001.getLayoutConstraint(); - location6001.setX(0); - location6001.setY(60); - Node label6002 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationNameEditPart.VISUAL_ID)); - label6002.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6002 = (Location)label6002.getLayoutConstraint(); - location6002.setX(0); - location6002.setY(20); - Node label6003 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationRoleTargetEditPart.VISUAL_ID)); - label6003.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6003 = (Location)label6003.getLayoutConstraint(); - location6003.setX(0); - location6003.setY(20); - Node label6005 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationRoleSourceEditPart.VISUAL_ID)); - label6005.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6005 = (Location)label6005.getLayoutConstraint(); - location6005.setX(0); - location6005.setY(-20); - Node label6033 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationMultiplicitySourceEditPart.VISUAL_ID)); - label6033.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6033 = (Location)label6033.getLayoutConstraint(); - location6033.setX(0); - location6033.setY(20); - Node label6034 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationMultiplicityTargetEditPart.VISUAL_ID)); - label6034.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6034 = (Location)label6034.getLayoutConstraint(); - location6034.setX(0); - location6034.setY(-20); + Node association_StereotypeLabel = createLabel(edge, + UMLVisualIDRegistry.getType(AssociationAppliedStereotypeEditPart.VISUAL_ID)); + association_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location association_StereotypeLabel_Location = (Location) association_StereotypeLabel.getLayoutConstraint(); + association_StereotypeLabel_Location.setX(0); + association_StereotypeLabel_Location.setY(60); + Node association_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationNameEditPart.VISUAL_ID)); + association_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location association_NameLabel_Location = (Location) association_NameLabel.getLayoutConstraint(); + association_NameLabel_Location.setX(0); + association_NameLabel_Location.setY(20); + Node association_TargetRoleLabel = createLabel(edge, + UMLVisualIDRegistry.getType(AssociationRoleTargetEditPart.VISUAL_ID)); + association_TargetRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location association_TargetRoleLabel_Location = (Location) association_TargetRoleLabel.getLayoutConstraint(); + association_TargetRoleLabel_Location.setX(0); + association_TargetRoleLabel_Location.setY(20); + Node association_SourceRoleLabel = createLabel(edge, + UMLVisualIDRegistry.getType(AssociationRoleSourceEditPart.VISUAL_ID)); + association_SourceRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location association_SourceRoleLabel_Location = (Location) association_SourceRoleLabel.getLayoutConstraint(); + association_SourceRoleLabel_Location.setX(0); + association_SourceRoleLabel_Location.setY(-20); + Node association_SourceMultiplicityLabel = createLabel(edge, + UMLVisualIDRegistry.getType(AssociationMultiplicitySourceEditPart.VISUAL_ID)); + association_SourceMultiplicityLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location association_SourceMultiplicityLabel_Location = (Location) association_SourceMultiplicityLabel + .getLayoutConstraint(); + association_SourceMultiplicityLabel_Location.setX(0); + association_SourceMultiplicityLabel_Location.setY(20); + Node association_TargetMultiplicityLabel = createLabel(edge, + UMLVisualIDRegistry.getType(AssociationMultiplicityTargetEditPart.VISUAL_ID)); + association_TargetMultiplicityLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location association_TargetMultiplicityLabel_Location = (Location) association_TargetMultiplicityLabel + .getLayoutConstraint(); + association_TargetMultiplicityLabel_Location.setX(0); + association_TargetMultiplicityLabel_Location.setY(-20); + PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Association"); return edge; } @@ -985,7 +1115,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Edge createProfileApplication_1045(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createProfileApplication_Edge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -998,19 +1129,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(ProfileApplicationEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ProfileApplication"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} + return edge; } /** * @generated */ - public Edge createAssociation_4019(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createAssociation_BranchEdge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1023,29 +1157,35 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(AssociationBranchEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationBranch"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} - Node label6024 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationBranchRoleEditPart.VISUAL_ID)); - label6024.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6024 = (Location)label6024.getLayoutConstraint(); - location6024.setX(0); - location6024.setY(-20); - Node label6035 = createLabel(edge, UMLVisualIDRegistry.getType(AssociationBranchMultiplicityEditPart.VISUAL_ID)); - label6035.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6035 = (Location)label6035.getLayoutConstraint(); - location6035.setX(0); - location6035.setY(20); + Node association_BranchRoleLabel = createLabel(edge, + UMLVisualIDRegistry.getType(AssociationBranchRoleEditPart.VISUAL_ID)); + association_BranchRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location association_BranchRoleLabel_Location = (Location) association_BranchRoleLabel.getLayoutConstraint(); + association_BranchRoleLabel_Location.setX(0); + association_BranchRoleLabel_Location.setY(-20); + Node association_BranchMultiplicityLabel = createLabel(edge, + UMLVisualIDRegistry.getType(AssociationBranchMultiplicityEditPart.VISUAL_ID)); + association_BranchMultiplicityLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location association_BranchMultiplicityLabel_Location = (Location) association_BranchMultiplicityLabel + .getLayoutConstraint(); + association_BranchMultiplicityLabel_Location.setX(0); + association_BranchMultiplicityLabel_Location.setY(20); + return edge; } /** * @generated */ - public Edge createGeneralization_4002(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createGeneralization_Edge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1058,17 +1198,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(GeneralizationEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Generalization"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} - Node label6007 = createLabel(edge, UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID)); - label6007.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6007 = (Location)label6007.getLayoutConstraint(); - location6007.setX(0); - location6007.setY(60); + Node generalization_StereotypeLabel = createLabel(edge, + UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID)); + generalization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location generalization_StereotypeLabel_Location = (Location) generalization_StereotypeLabel + .getLayoutConstraint(); + generalization_StereotypeLabel_Location.setX(0); + generalization_StereotypeLabel_Location.setY(60); + PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Generalization"); return edge; } @@ -1076,7 +1220,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Edge createDependency_4008(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createDependency_Edge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1089,22 +1234,25 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(DependencyEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Dependency"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} - Node label6026 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID)); - label6026.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6026 = (Location)label6026.getLayoutConstraint(); - location6026.setX(0); - location6026.setY(40); - Node label6027 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID)); - label6027.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6027 = (Location)label6027.getLayoutConstraint(); - location6027.setX(0); - location6027.setY(60); + Node dependency_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID)); + dependency_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location dependency_NameLabel_Location = (Location) dependency_NameLabel.getLayoutConstraint(); + dependency_NameLabel_Location.setX(0); + dependency_NameLabel_Location.setY(40); + Node dependency_StereotypeLabel = createLabel(edge, + UMLVisualIDRegistry.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID)); + dependency_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location dependency_StereotypeLabel_Location = (Location) dependency_StereotypeLabel.getLayoutConstraint(); + dependency_StereotypeLabel_Location.setX(0); + dependency_StereotypeLabel_Location.setY(60); + PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Dependency"); return edge; } @@ -1112,7 +1260,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Edge createDependency_4018(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createDependency_BranchEdge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1125,19 +1274,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(DependencyBranchEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Dependency"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} + return edge; } /** * @generated */ - public Edge createElementImport_1064(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createElementImport_Edge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1150,22 +1302,27 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(ElementImportEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ElementImport"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} - Node label6020 = createLabel(edge, UMLVisualIDRegistry.getType(ElementImportAliasEditPart.VISUAL_ID)); - label6020.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6020 = (Location)label6020.getLayoutConstraint(); - location6020.setX(0); - location6020.setY(40); - Node label6021 = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeElementImportEditPart.VISUAL_ID)); - label6021.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6021 = (Location)label6021.getLayoutConstraint(); - location6021.setX(0); - location6021.setY(60); + Node elementImport_AliasLabel = createLabel(edge, + UMLVisualIDRegistry.getType(ElementImportAliasEditPart.VISUAL_ID)); + elementImport_AliasLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location elementImport_AliasLabel_Location = (Location) elementImport_AliasLabel.getLayoutConstraint(); + elementImport_AliasLabel_Location.setX(0); + elementImport_AliasLabel_Location.setY(40); + Node elementImport_StereotypeLabel = createLabel(edge, + UMLVisualIDRegistry.getType(AppliedStereotypeElementImportEditPart.VISUAL_ID)); + elementImport_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location elementImport_StereotypeLabel_Location = (Location) elementImport_StereotypeLabel + .getLayoutConstraint(); + elementImport_StereotypeLabel_Location.setX(0); + elementImport_StereotypeLabel_Location.setY(60); + PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "ElementImport"); return edge; } @@ -1173,7 +1330,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Edge createPackageImport_1065(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createPackageImport_Edge(EObject domainElement, View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1186,17 +1344,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(PackageImportEditPart.VISUAL_ID)); edge.setElement(domainElement); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "PackageImport"); //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} - Node label6022 = createLabel(edge, UMLVisualIDRegistry.getType(PackageImportAppliedStereotypeEditPart.VISUAL_ID)); - label6022.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location6022 = (Location)label6022.getLayoutConstraint(); - location6022.setX(0); - location6022.setY(60); + Node packageImport_StereotypeLabel = createLabel(edge, + UMLVisualIDRegistry.getType(PackageImportAppliedStereotypeEditPart.VISUAL_ID)); + packageImport_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location packageImport_StereotypeLabel_Location = (Location) packageImport_StereotypeLabel + .getLayoutConstraint(); + packageImport_StereotypeLabel_Location.setX(0); + packageImport_StereotypeLabel_Location.setY(60); + PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "PackageImport"); return edge; } @@ -1204,7 +1366,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - public Edge createCommentAnnotatedElement_1022(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createComment_AnnotatedElementEdge(View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1217,18 +1380,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(CommentAnnotatedElementEditPart.VISUAL_ID)); edge.setElement(null); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} + return edge; } /** * @generated */ - public Edge createConstraintConstrainedElement_4014(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createConstraint_ConstrainedElementEdge(View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1241,18 +1407,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(ConstraintConstrainedElementEditPart.VISUAL_ID)); edge.setElement(null); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} + return edge; } /** * @generated */ - public Edge createConstraintContext_8500(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { + public Edge createConstraint_ContextEdge(View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); @@ -1265,16 +1434,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { edge.setType(UMLVisualIDRegistry.getType(ContextLinkEditPart.VISUAL_ID)); edge.setElement(null); // initializePreferences - final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); + //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); //if (routing != null) { // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); //} - Node label8501 = createLabel(edge, UMLVisualIDRegistry.getType(ContextLinkAppliedStereotypeEditPart.VISUAL_ID)); - label8501.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location8501 = (Location)label8501.getLayoutConstraint(); - location8501.setX(0); - location8501.setY(60); + Node constraint_KeywordLabel = createLabel(edge, + UMLVisualIDRegistry.getType(ContextLinkAppliedStereotypeEditPart.VISUAL_ID)); + constraint_KeywordLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location constraint_KeywordLabel_Location = (Location) constraint_KeywordLabel.getLayoutConstraint(); + constraint_KeywordLabel_Location.setX(0); + constraint_KeywordLabel_Location.setY(60); + PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Undefined"); return edge; } @@ -1283,7 +1455,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { * @generated */ protected void stampShortcut(View containerView, Node target) { - if(!ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) { + if (!ProfileDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) { EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation(); shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", ProfileDiagramEditPart.MODEL_ID); //$NON-NLS-1$ @@ -1304,20 +1476,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ - protected Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter) { + protected Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, + boolean canFilter) { //SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment(); //rv.setShowTitle(showTitle); //rv.setCollapsed(isCollapsed); Node rv = NotationFactory.eINSTANCE.createBasicCompartment(); + rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); - if(hasTitle) { + + if (hasTitle) { TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle(); rv.getStyles().add(ts); } - if(canSort) { + if (canSort) { rv.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle()); } - if(canFilter) { + if (canFilter) { rv.getStyles().add(NotationFactory.eINSTANCE.createFilteringStyle()); } rv.setType(hint); @@ -1329,11 +1504,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { * @generated */ protected EObject getSemanticElement(IAdaptable semanticAdapter) { - if(semanticAdapter == null) { + if (semanticAdapter == null) { return null; } - EObject eObject = (EObject)semanticAdapter.getAdapter(EObject.class); - if(eObject != null) { + EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class); + if (eObject != null) { return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject); } return null; @@ -1343,25 +1518,29 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { * @generated */ protected IElementType getSemanticElementType(IAdaptable semanticAdapter) { - if(semanticAdapter == null) { + if (semanticAdapter == null) { return null; } - return (IElementType)semanticAdapter.getAdapter(IElementType.class); + return (IElementType) semanticAdapter.getAdapter(IElementType.class); } /** * @generated */ private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) { - String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT); - String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT); - FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE); - if(viewFontStyle != null) { + String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, + PreferencesConstantsHelper.FONT); + String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, + PreferencesConstantsHelper.COLOR_FONT); + + FontStyle viewFontStyle = (FontStyle) view.getStyle(NotationPackage.Literals.FONT_STYLE); + if (viewFontStyle != null) { FontData fontData = PreferenceConverter.getFontData(store, fontConstant); viewFontStyle.setFontName(fontData.getName()); viewFontStyle.setFontHeight(fontData.getHeight()); viewFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0); viewFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0); + org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(store, fontColorConstant); viewFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue()); } @@ -1371,24 +1550,35 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { * @generated */ private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) { - String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE); + String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, + PreferencesConstantsHelper.COLOR_LINE); org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant); - ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); + ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), + FigureUtilities.RGBToInteger(lineRGB)); } /** * @generated */ private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) { - String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL); - String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT); - String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY); + String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, + PreferencesConstantsHelper.COLOR_FILL); + String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, + PreferencesConstantsHelper.COLOR_GRADIENT); + String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, + PreferencesConstantsHelper.GRADIENT_POLICY); + org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant); - ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB)); - FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE); - fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());; - if(store.getBoolean(gradientPolicyConstant)) { - GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(gradientColorConstant)); + ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), + FigureUtilities.RGBToInteger(fillRGB)); + + FillStyle fillStyle = (FillStyle) view.getStyle(NotationPackage.Literals.FILL_STYLE); + fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue()); + + ; + if (store.getBoolean(gradientPolicyConstant)) { + GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter( + store.getString(gradientColorConstant)); fillStyle.setGradient(gradientPreferenceConverter.getGradientData()); fillStyle.setTransparency(gradientPreferenceConverter.getTransparency()); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLVisualTypeProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLVisualTypeProvider.java index 9902cc5e21e..fc8d5babf8f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLVisualTypeProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLVisualTypeProvider.java @@ -36,11 +36,13 @@ public class UMLVisualTypeProvider extends AbstractVisualTypeProvider { @Override public IElementType getElementType(Diagram diagram, String viewType) { IElementType result = null; + try { result = UMLElementTypes.getElementType(viewType); } catch (NumberFormatException e) { // Not supported by this diagram } + return result; } 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 19a505ef2bc..14493e51532 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 @@ -32,8 +32,8 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr */ public String getText(Object element) { element = unwrap(element); - if(element instanceof UMLNavigatorGroup) { - return ((UMLNavigatorGroup)element).getGroupName(); + if (element instanceof UMLNavigatorGroup) { + return ((UMLNavigatorGroup) element).getGroupName(); } IElementType etype = getElementType(getView(element)); return etype == null ? "" : etype.getDisplayName(); @@ -51,8 +51,8 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr * @generated */ private Object unwrap(Object element) { - if(element instanceof IStructuredSelection) { - return ((IStructuredSelection)element).getFirstElement(); + if (element instanceof IStructuredSelection) { + return ((IStructuredSelection) element).getFirstElement(); } return element; } @@ -61,11 +61,11 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr * @generated */ private View getView(Object element) { - if(element instanceof View) { - return (View)element; + if (element instanceof View) { + return (View) element; } - if(element instanceof IAdaptable) { - return (View)((IAdaptable)element).getAdapter(View.class); + if (element instanceof IAdaptable) { + return (View) ((IAdaptable) element).getAdapter(View.class); } return null; } @@ -75,13 +75,13 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr */ private IElementType getElementType(View view) { // For intermediate views climb up the containment hierarchy to find the one associated with an element type. - while(view != null) { + while (view != null) { String vid = UMLVisualIDRegistry.getVisualID(view); IElementType etype = UMLElementTypes.getElementType(vid); - if(etype != null) { + if (etype != null) { return etype; } - view = view.eContainer() instanceof View ? (View)view.eContainer() : null; + view = view.eContainer() instanceof View ? (View) view.eContainer() : null; } return null; } |