diff options
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit')
66 files changed, 5743 insertions, 205 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java index 1cc5857c03f..b9d914ae021 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java @@ -25,7 +25,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Component;
import org.eclipse.uml2.uml.UMLFactory;
@@ -95,8 +94,8 @@ public class ComponentCreateCommandCN extends EditElementCommand { */
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
Component newElement = UMLFactory.eINSTANCE.createComponent();
- Class owner = (Class)getElementToEdit();
- owner.getNestedClassifiers().add(newElement);
+ Component owner = (Component)getElementToEdit();
+ owner.getPackagedElements().add(newElement);
ElementInitializers.getInstance().init_Component_3070(newElement);
doConfigure(newElement, monitor, info);
((CreateElementRequest)getRequest()).setNewElement(newElement);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorCreateCommand.java new file mode 100644 index 00000000000..353de7eebf7 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorCreateCommand.java @@ -0,0 +1,164 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.StructuredClassifier;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class ConnectorCreateCommand extends EditElementCommand {
+
+ /**
+ * @generated
+ */
+ protected final EObject source;
+
+ /**
+ * @generated
+ */
+ protected final EObject target;
+
+ /**
+ * @generated
+ */
+ protected StructuredClassifier container;
+
+ /**
+ * @generated
+ */
+ public ConnectorCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
+ super(request.getLabel(), null, request);
+ this.source = source;
+ this.target = target;
+ container = deduceContainer(source, target);
+ }
+
+ /**
+ * @generated
+ */
+ public boolean canExecute() {
+ if(source == null && target == null) {
+ return false;
+ }
+ if(source != null && false == source instanceof ConnectorEnd) {
+ return false;
+ }
+ if(target != null && false == target instanceof ConnectorEnd) {
+ return false;
+ }
+ if(getSource() == null) {
+ return true; // link creation is in progress; source is not defined yet
+ }
+ // target may be null here but it's possible to check constraint
+ if(getContainer() == null) {
+ return false;
+ }
+ return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConnector_4019(getContainer(), getSource(), getTarget());
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ if(!canExecute()) {
+ throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
+ }
+ Connector newElement = UMLFactory.eINSTANCE.createConnector();
+ getContainer().getOwnedConnectors().add(newElement);
+ newElement.getEnds().add(getSource());
+ newElement.getEnds().add(getTarget());
+ ElementInitializers.getInstance().init_Connector_4019(newElement);
+ doConfigure(newElement, monitor, info);
+ ((CreateElementRequest)getRequest()).setNewElement(newElement);
+ return CommandResult.newOKCommandResult(newElement);
+ }
+
+ /**
+ * @generated
+ */
+ protected void doConfigure(Connector newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
+ ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+ configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());
+ configureRequest.addParameters(getRequest().getParameters());
+ configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
+ configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
+ ICommand configureCommand = elementType.getEditCommand(configureRequest);
+ if(configureCommand != null && configureCommand.canExecute()) {
+ configureCommand.execute(monitor, info);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setElementToEdit(EObject element) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @generated
+ */
+ protected ConnectorEnd getSource() {
+ return (ConnectorEnd)source;
+ }
+
+ /**
+ * @generated
+ */
+ protected ConnectorEnd getTarget() {
+ return (ConnectorEnd)target;
+ }
+
+ /**
+ * @generated
+ */
+ public StructuredClassifier getContainer() {
+ return container;
+ }
+
+ /**
+ * Default approach is to traverse ancestors of the source to find instance of container.
+ * Modify with appropriate logic.
+ *
+ * @generated
+ */
+ protected StructuredClassifier deduceContainer(EObject source, EObject target) {
+ // Find container element for the new 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; element = element.eContainer()) {
+ if(element instanceof StructuredClassifier) {
+ return (StructuredClassifier)element;
+ }
+ }
+ return null;
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java new file mode 100644 index 00000000000..6cf570c1e60 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java @@ -0,0 +1,177 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.StructuredClassifier;
+
+/**
+ * @generated
+ */
+public class ConnectorReorientCommand extends EditElementCommand {
+
+ /**
+ * @generated
+ */
+ private final int reorientDirection;
+
+ /**
+ * @generated
+ */
+ private final EObject oldEnd;
+
+ /**
+ * @generated
+ */
+ private final EObject newEnd;
+
+ /**
+ * @generated
+ */
+ public ConnectorReorientCommand(ReorientRelationshipRequest request) {
+ super(request.getLabel(), request.getRelationship(), request);
+ reorientDirection = request.getDirection();
+ oldEnd = request.getOldRelationshipEnd();
+ newEnd = request.getNewRelationshipEnd();
+ }
+
+ /**
+ * @generated
+ */
+ public boolean canExecute() {
+ if(false == getElementToEdit() instanceof Connector) {
+ return false;
+ }
+ if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
+ return canReorientSource();
+ }
+ if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
+ return canReorientTarget();
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean canReorientSource() {
+ if(!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {
+ return false;
+ }
+ if(getLink().getEnds().size() != 1) {
+ return false;
+ }
+ ConnectorEnd target = (ConnectorEnd)getLink().getEnds().get(0);
+ if(!(getLink().eContainer() instanceof StructuredClassifier)) {
+ return false;
+ }
+ StructuredClassifier container = (StructuredClassifier)getLink().eContainer();
+ return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4019(container, getLink(), getNewSource(), target);
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean canReorientTarget() {
+ if(!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {
+ return false;
+ }
+ if(getLink().getEnds().size() != 1) {
+ return false;
+ }
+ ConnectorEnd source = (ConnectorEnd)getLink().getEnds().get(0);
+ if(!(getLink().eContainer() instanceof StructuredClassifier)) {
+ return false;
+ }
+ StructuredClassifier container = (StructuredClassifier)getLink().eContainer();
+ return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4019(container, getLink(), source, getNewTarget());
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ if(!canExecute()) {
+ throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
+ }
+ if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
+ return reorientSource();
+ }
+ if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
+ return reorientTarget();
+ }
+ throw new IllegalStateException();
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult reorientSource() throws ExecutionException {
+ getLink().getEnds().remove(getOldSource());
+ getLink().getEnds().add(getNewSource());
+ return CommandResult.newOKCommandResult(getLink());
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult reorientTarget() throws ExecutionException {
+ getLink().getEnds().remove(getOldTarget());
+ getLink().getEnds().add(getNewTarget());
+ return CommandResult.newOKCommandResult(getLink());
+ }
+
+ /**
+ * @generated
+ */
+ protected Connector getLink() {
+ return (Connector)getElementToEdit();
+ }
+
+ /**
+ * @generated
+ */
+ protected ConnectorEnd getOldSource() {
+ return (ConnectorEnd)oldEnd;
+ }
+
+ /**
+ * @generated
+ */
+ protected ConnectorEnd getNewSource() {
+ return (ConnectorEnd)newEnd;
+ }
+
+ /**
+ * @generated
+ */
+ protected ConnectorEnd getOldTarget() {
+ return (ConnectorEnd)oldEnd;
+ }
+
+ /**
+ * @generated
+ */
+ protected ConnectorEnd getNewTarget() {
+ return (ConnectorEnd)newEnd;
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java index 18f34e74c01..6d5c6a1244f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java @@ -145,8 +145,8 @@ public class DependencyBranchCreateCommand extends EditElementCommand { }
/**
- * Default approach is to traverse ancestors of the source to find instance of container.
- * Modify with appropriate logic.
+ * Default approach is to traverse ancestors of the source to find instance
+ * of container. Modify with appropriate logic.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java new file mode 100644 index 00000000000..f52dbd6f352 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java @@ -0,0 +1,110 @@ +/*
+ *
+ */
+package org.eclipse.papyrus.uml.diagram.component.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.StructuredClassifier;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * @generated
+ */
+public class PropertyCreateCommand extends EditElementCommand {
+
+ /**
+ * @generated
+ */
+ private EClass eClass = null;
+
+ /**
+ * @generated
+ */
+ private EObject eObject = null;
+
+ /**
+ * @generated
+ */
+ public PropertyCreateCommand(CreateElementRequest req, EObject eObject) {
+ super(req.getLabel(), null, req);
+ this.eObject = eObject;
+ this.eClass = eObject != null ? eObject.eClass() : null;
+ }
+
+ /**
+ * @generated
+ */
+ public static PropertyCreateCommand create(CreateElementRequest req, EObject eObject) {
+ return new PropertyCreateCommand(req, eObject);
+ }
+
+ /**
+ * @generated
+ */
+ public PropertyCreateCommand(CreateElementRequest req) {
+ super(req.getLabel(), null, req);
+ }
+
+ /**
+ * FIXME: replace with setElementToEdit()
+ *
+ * @generated
+ */
+ protected EObject getElementToEdit() {
+ EObject container = ((CreateElementRequest)getRequest()).getContainer();
+ if(container instanceof View) {
+ container = ((View)container).getElement();
+ }
+ if(container != null) {
+ return container;
+ }
+ return eObject;
+ }
+
+ /**
+ * @generated
+ */
+ public boolean canExecute() {
+ return true;
+ }
+
+ /**
+ * @generated
+ */
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ Property newElement = UMLFactory.eINSTANCE.createProperty();
+ StructuredClassifier owner = (StructuredClassifier)getElementToEdit();
+ owner.getOwnedAttributes().add(newElement);
+ ElementInitializers.getInstance().init_Property_3079(newElement);
+ doConfigure(newElement, monitor, info);
+ ((CreateElementRequest)getRequest()).setNewElement(newElement);
+ return CommandResult.newOKCommandResult(newElement);
+ }
+
+ /**
+ * @generated
+ */
+ protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
+ ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+ configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());
+ configureRequest.addParameters(getRequest().getParameters());
+ ICommand configureCommand = elementType.getEditCommand(configureRequest);
+ if(configureCommand != null && configureCommand.canExecute()) {
+ configureCommand.execute(monitor, info);
+ }
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java new file mode 100644 index 00000000000..c1e4878e4bc --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java @@ -0,0 +1,21 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.helpers;
+
+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
+
+/**
+ * @generated
+ */
+public class ConnectorEditHelper extends UMLBaseEditHelper {
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java index 09108bc2474..984ac827787 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -197,8 +197,8 @@ public class CommentEditPart extends AbstractCommentEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Comment";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -349,6 +349,9 @@ public class CommentEditPart extends AbstractCommentEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.CommentAnnotatedElement_4015);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.CommentAnnotatedElement_4015);
+ }
return types;
}
@@ -376,6 +379,7 @@ public class CommentEditPart extends AbstractCommentEditPart { types.add(UMLElementTypes.Comment_3074);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -415,15 +419,15 @@ public class CommentEditPart extends AbstractCommentEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java index 45b690ecf01..bc6632ee81f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -197,8 +197,8 @@ public class CommentEditPartPCN extends AbstractCommentEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Comment";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -349,6 +349,9 @@ public class CommentEditPartPCN extends AbstractCommentEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.CommentAnnotatedElement_4015);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.CommentAnnotatedElement_4015);
+ }
return types;
}
@@ -376,6 +379,7 @@ public class CommentEditPartPCN extends AbstractCommentEditPart { types.add(UMLElementTypes.Comment_3074);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -415,15 +419,15 @@ public class CommentEditPartPCN extends AbstractCommentEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java index e6345e3982f..d8952aa4df1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java @@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
@@ -251,8 +251,8 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE protected NodeFigure createNodePlate() {
String prefElementId = "Component";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -405,6 +405,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -480,6 +483,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -528,6 +534,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -576,6 +585,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -624,6 +636,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -672,6 +687,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -720,6 +738,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -745,6 +766,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -773,6 +795,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -790,6 +813,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -807,6 +831,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -824,6 +849,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -841,6 +867,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -858,6 +885,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -902,6 +930,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Generalization_4003) {
types.add(UMLElementTypes.Component_2002);
types.add(UMLElementTypes.Interface_3205);
@@ -926,6 +955,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -943,6 +973,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -960,6 +991,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -977,6 +1009,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -1000,6 +1033,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -1017,6 +1051,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -1031,15 +1066,15 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java index 438f43aea89..9a46b0f2d46 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java @@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
@@ -250,8 +250,8 @@ public class ComponentEditPartCN extends NamedElementEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Component";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -404,6 +404,9 @@ public class ComponentEditPartCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -479,6 +482,9 @@ public class ComponentEditPartCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -527,6 +533,9 @@ public class ComponentEditPartCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -575,6 +584,9 @@ public class ComponentEditPartCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -623,6 +635,9 @@ public class ComponentEditPartCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -671,6 +686,9 @@ public class ComponentEditPartCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -719,6 +737,9 @@ public class ComponentEditPartCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -744,6 +765,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -772,6 +794,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -789,6 +812,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -806,6 +830,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -823,6 +848,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -840,6 +866,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -857,6 +884,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -901,6 +929,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Generalization_4003) {
types.add(UMLElementTypes.Component_2002);
types.add(UMLElementTypes.Interface_3205);
@@ -925,6 +954,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -942,6 +972,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -959,6 +990,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -976,6 +1008,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -999,6 +1032,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -1016,6 +1050,7 @@ public class ComponentEditPartCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -1030,15 +1065,15 @@ public class ComponentEditPartCN extends NamedElementEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java index d6e078b047f..acdcb620423 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java @@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
@@ -250,8 +250,8 @@ public class ComponentEditPartPCN extends NamedElementEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Component";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -404,6 +404,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -479,6 +482,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -527,6 +533,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -575,6 +584,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -623,6 +635,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -671,6 +686,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -719,6 +737,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -744,6 +765,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -772,6 +794,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -789,6 +812,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -806,6 +830,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -823,6 +848,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -840,6 +866,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -857,6 +884,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -901,6 +929,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Generalization_4003) {
types.add(UMLElementTypes.Component_2002);
types.add(UMLElementTypes.Interface_3205);
@@ -925,6 +954,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -942,6 +972,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -959,6 +990,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -976,6 +1008,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -999,6 +1032,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -1016,6 +1050,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -1030,15 +1065,15 @@ public class ComponentEditPartPCN extends NamedElementEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java new file mode 100644 index 00000000000..58d849699df --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java @@ -0,0 +1,751 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+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;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 6024;
+
+ /**
+ * @generated
+ */
+ private DirectEditManager manager;
+
+ /**
+ * @generated
+ */
+ private IParser parser;
+
+ /**
+ * @generated
+ */
+ private List<?> parserElements;
+
+ /**
+ * @generated
+ */
+ private String defaultText;
+
+ /**
+ * direct edition mode (default, undefined, registered editor, etc.)
+ *
+ * @generated
+ */
+ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+ /**
+ * configuration from a registered edit dialog
+ *
+ * @generated
+ */
+ protected IDirectEditorConfiguration configuration;
+ /**
+ * @generated
+ */
+ static {
+ registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
+ }
+
+ /**
+ * @generated
+ */
+ public ConnectorAppliedStereotypeEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+ installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
+ }
+
+ /**
+ * @generated
+ */
+ public int getKeyPoint() {
+ return ConnectionLocator.MIDDLE;
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelTextHelper(IFigure figure) {
+ if(figure instanceof WrappingLabel) {
+ return ((WrappingLabel)figure).getText();
+ } else if(figure instanceof ILabelFigure) {
+ return ((ILabelFigure)figure).getText();
+ } else {
+ return ((Label)figure).getText();
+ }
+ }
+
+ /**
+ * @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);
+ } else {
+ ((Label)figure).setText(text);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIconHelper(IFigure figure) {
+ if(figure instanceof WrappingLabel) {
+ return ((WrappingLabel)figure).getIcon();
+ } else if(figure instanceof ILabelFigure) {
+ return ((ILabelFigure)figure).getIcon();
+ } else {
+ return ((Label)figure).getIcon();
+ }
+ }
+
+ /**
+ * @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);
+ } else {
+ ((Label)figure).setIcon(icon);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabel(WrappingLabel figure) {
+ unregisterVisuals();
+ setFigure(figure);
+ defaultText = getLabelTextHelper(figure);
+ registerVisuals();
+ refreshVisuals();
+ }
+
+ /**
+ * @generated
+ */
+ protected List getModelChildren() {
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * @generated
+ */
+ public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ public void setParser(IParser parser) {
+ this.parser = parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected EObject getParserElement() {
+ return resolveSemanticElement();
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIcon() {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelText() {
+ String text = null;
+ EObject parserElement = getParserElement();
+ if(parserElement != null && getParser() != null) {
+ text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());
+ }
+ if(text == null || text.length() == 0) {
+ text = defaultText;
+ }
+ return text;
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabelText(String text) {
+ setLabelTextHelper(getFigure(), text);
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public String getEditText() {
+ if(getParserElement() == null || getParser() == null) {
+ return ""; //$NON-NLS-1$
+ }
+ return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean isEditable() {
+ return getParser() != null;
+ }
+
+ /**
+ * @generated
+ */
+ public ICellEditorValidator getEditTextValidator() {
+ return new ICellEditorValidator() {
+
+ public String isValid(final Object value) {
+ if(value instanceof String) {
+ final EObject element = getParserElement();
+ final IParser parser = getParser();
+ try {
+ IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+
+ public void run() {
+ setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));
+ }
+ });
+ return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+ } catch (InterruptedException ie) {
+ ie.printStackTrace();
+ }
+ }
+ // shouldn't get here
+ return null;
+ }
+ };
+ }
+
+ /**
+ * @generated
+ */
+ public IContentAssistProcessor getCompletionProcessor() {
+ if(getParserElement() == null || getParser() == null) {
+ return null;
+ }
+ return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+ }
+
+ /**
+ * @generated
+ */
+ public ParserOptions getParserOptions() {
+ return ParserOptions.NONE;
+ }
+
+ /**
+ * @generated
+ */
+ public IParser getParser() {
+ if(parser == null) {
+ parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID));
+ }
+ return parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected DirectEditManager getManager() {
+ if(manager == null) {
+ setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));
+ }
+ return manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void setManager(DirectEditManager manager) {
+ this.manager = manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit() {
+ getManager().show();
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit(Point eventLocation) {
+ if(getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private void performDirectEdit(char initialCharacter) {
+ if(getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager)getManager()).show(initialCharacter);
+ } else {
+ performDirectEdit();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEditRequest(Request request) {
+ final Request theRequest = request;
+ if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+ directEditionMode = getDirectEditionType();
+ }
+ 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) {
+ // Create default edit manager
+ 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));
+ setParser(((ICustomDirectEditorConfiguration)configuration).createParser(this.resolveSemanticElement()));
+ initializeDirectEditManager(theRequest);
+ return;
+ } 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(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);
+ } else {
+ return;
+ }
+ final Dialog finalDialog = dialog;
+ 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());
+ }
+ };
+ domain.getCommandStack().execute(command);
+ }
+ }
+ break;
+ case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+ initializeDirectEditManager(theRequest);
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void initializeDirectEditManager(final Request request) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ 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);
+ performDirectEdit(initialChar.charValue());
+ } else if((request instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest)request;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshLabel();
+ refreshFont();
+ refreshFontColor();
+ refreshUnderline();
+ refreshStrikeThrough();
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshLabel() {
+ EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+ if(maskLabelPolicy == null) {
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
+ }
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshUnderline() {
+ 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);
+ } else {
+ ((WrappingLabel)getFigure()).setTextUnderline(false);
+ }
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshStrikeThrough() {
+ FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+ }
+ }
+
+ /**
+ * @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));
+ setFont(fontData);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setFontColor(Color color) {
+ getFigure().setForegroundColor(color);
+ }
+
+ /**
+ * @generated
+ */
+ protected void addSemanticListeners() {
+ 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$
+ }
+ } else {
+ super.addSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeSemanticListeners() {
+ if(parserElements != null) {
+ for(int i = 0; i < parserElements.size(); i++) {
+ removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+ }
+ } else {
+ super.removeSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected AccessibleEditPart getAccessibleEditPart() {
+ if(accessibleEP == null) {
+ accessibleEP = new AccessibleGraphicalEditPart() {
+
+ public void getName(AccessibleEvent e) {
+ e.result = getLabelTextHelper(getFigure());
+ }
+ };
+ }
+ return accessibleEP;
+ }
+
+ /**
+ * @generated
+ */
+ private View getFontStyleOwnerView() {
+ return getPrimaryView();
+ }
+
+ /**
+ * Returns the kind of associated editor for direct edition.
+ *
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @generated
+ */
+ public int getDirectEditionType() {
+ if(checkExtendedEditor()) {
+ initExtendedEditorConfiguration();
+ return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+ }
+ if(checkDefaultEdition()) {
+ return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+ }
+ // not a named element. no specific editor => do nothing
+ return IDirectEdition.NO_DIRECT_EDITION;
+ }
+
+ /**
+ * Checks if an extended editor is present.
+ *
+ * @return <code>true</code> if an extended editor is present.
+ * @generated
+ */
+ protected boolean checkExtendedEditor() {
+ if(resolveSemanticElement() != null) {
+ return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ return false;
+ }
+
+ /**
+ * Checks if a default direct edition is available
+ *
+ * @return <code>true</code> if a default direct edition is available
+ * @generated
+ */
+ protected boolean checkDefaultEdition() {
+ return (getParser() != null);
+ }
+
+ /**
+ * Initializes the extended editor configuration
+ *
+ * @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().eClass().getInstanceClassName());
+ } else {
+ configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ }
+ }
+
+ /**
+ * Updates the preference configuration
+ *
+ * @generated
+ */
+ protected void updateExtendedEditorConfiguration() {
+ String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+ } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+ configuration = null;
+ }
+ }
+
+ /**
+ * Performs the direct edit usually used by GMF editors.
+ *
+ * @param theRequest
+ * the direct edit request that starts the direct edit system
+ * @generated
+ */
+ protected void performDefaultDirectEditorEdit(final Request theRequest) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ 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);
+ performDirectEdit(initialChar.charValue());
+ } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification event) {
+ Object feature = event.getFeature();
+ 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)) {
+ refreshUnderline();
+ } 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)) {
+ refreshFont();
+ } else {
+ if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+ refreshLabel();
+ }
+ if(getParser() instanceof ISemanticParser) {
+ ISemanticParser modelParser = (ISemanticParser)getParser();
+ if(modelParser.areSemanticElementsAffected(null, event)) {
+ removeSemanticListeners();
+ if(resolveSemanticElement() != null) {
+ addSemanticListeners();
+ }
+ refreshLabel();
+ }
+ }
+ }
+ super.handleNotificationEvent(event);
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigure() {
+ // Parent should assign one using setLabel() method
+ return null;
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java new file mode 100644 index 00000000000..9bfc0a0aac1 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java @@ -0,0 +1,117 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.ConnectorFigure;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.ConnectorItemSemanticEditPolicy;
+
+/**
+ * @generated
+ */
+public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 4019;
+
+ /**
+ * @generated
+ */
+ public ConnectorEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorItemSemanticEditPolicy());
+ installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean addFixedChild(EditPart childEditPart) {
+ if(childEditPart instanceof ConnectorAppliedStereotypeEditPart) {
+ ((ConnectorAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());
+ return true;
+ }
+ if(childEditPart instanceof ConnectorNameEditPart) {
+ ((ConnectorNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ protected void addChildVisual(EditPart childEditPart, int index) {
+ if(addFixedChild(childEditPart)) {
+ return;
+ }
+ super.addChildVisual(childEditPart, -1);
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean removeFixedChild(EditPart childEditPart) {
+ if(childEditPart instanceof ConnectorAppliedStereotypeEditPart) {
+ return true;
+ }
+ if(childEditPart instanceof ConnectorNameEditPart) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeChildVisual(EditPart childEditPart) {
+ if(removeFixedChild(childEditPart)) {
+ return;
+ }
+ super.removeChildVisual(childEditPart);
+ }
+
+ /**
+ * Creates figure for this edit part.
+ *
+ * Body of this method does not depend on settings in generation model
+ * so you may safely remove <i>generated</i> tag and modify it.
+ *
+ * @generated
+ */
+ protected Connection createConnectionFigure() {
+ return new ConnectorFigure();
+ }
+
+ /**
+ * @generated
+ */
+ public ConnectorFigure getPrimaryShape() {
+ return (ConnectorFigure)getFigure();
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java new file mode 100644 index 00000000000..3358db897ea --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java @@ -0,0 +1,766 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+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;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, ILabelRoleProvider {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 6025;
+
+ /**
+ * @generated
+ */
+ private DirectEditManager manager;
+
+ /**
+ * @generated
+ */
+ private IParser parser;
+
+ /**
+ * @generated
+ */
+ private List<?> parserElements;
+
+ /**
+ * @generated
+ */
+ private String defaultText;
+
+ /**
+ * direct edition mode (default, undefined, registered editor, etc.)
+ *
+ * @generated
+ */
+ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+ /**
+ * configuration from a registered edit dialog
+ *
+ * @generated
+ */
+ protected IDirectEditorConfiguration configuration;
+ /**
+ * @generated
+ */
+ static {
+ registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart.VISUAL_ID), new Point(0, -20));
+ }
+
+ /**
+ * @generated
+ */
+ public ConnectorNameEditPart(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+ installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
+ }
+
+ /**
+ * @generated
+ */
+ public int getKeyPoint() {
+ return ConnectionLocator.MIDDLE;
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelTextHelper(IFigure figure) {
+ if(figure instanceof WrappingLabel) {
+ return ((WrappingLabel)figure).getText();
+ } else if(figure instanceof ILabelFigure) {
+ return ((ILabelFigure)figure).getText();
+ } else {
+ return ((Label)figure).getText();
+ }
+ }
+
+ /**
+ * @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);
+ } else {
+ ((Label)figure).setText(text);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIconHelper(IFigure figure) {
+ if(figure instanceof WrappingLabel) {
+ return ((WrappingLabel)figure).getIcon();
+ } else if(figure instanceof ILabelFigure) {
+ return ((ILabelFigure)figure).getIcon();
+ } else {
+ return ((Label)figure).getIcon();
+ }
+ }
+
+ /**
+ * @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);
+ } else {
+ ((Label)figure).setIcon(icon);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabel(WrappingLabel figure) {
+ unregisterVisuals();
+ setFigure(figure);
+ defaultText = getLabelTextHelper(figure);
+ registerVisuals();
+ refreshVisuals();
+ }
+
+ /**
+ * @generated
+ */
+ protected List getModelChildren() {
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * @generated
+ */
+ public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ public void setParser(IParser parser) {
+ this.parser = parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected EObject getParserElement() {
+ return resolveSemanticElement();
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIcon() {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelText() {
+ String text = null;
+ EObject parserElement = getParserElement();
+ if(parserElement != null && getParser() != null) {
+ text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());
+ }
+ if(text == null || text.length() == 0) {
+ text = defaultText;
+ }
+ return text;
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabelText(String text) {
+ setLabelTextHelper(getFigure(), text);
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public String getEditText() {
+ if(getParserElement() == null || getParser() == null) {
+ return ""; //$NON-NLS-1$
+ }
+ return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean isEditable() {
+ return getParser() != null;
+ }
+
+ /**
+ * @generated
+ */
+ public ICellEditorValidator getEditTextValidator() {
+ return new ICellEditorValidator() {
+
+ public String isValid(final Object value) {
+ if(value instanceof String) {
+ final EObject element = getParserElement();
+ final IParser parser = getParser();
+ try {
+ IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+
+ public void run() {
+ setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));
+ }
+ });
+ return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+ } catch (InterruptedException ie) {
+ ie.printStackTrace();
+ }
+ }
+ // shouldn't get here
+ return null;
+ }
+ };
+ }
+
+ /**
+ * @generated
+ */
+ public IContentAssistProcessor getCompletionProcessor() {
+ if(getParserElement() == null || getParser() == null) {
+ return null;
+ }
+ return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+ }
+
+ /**
+ * @generated
+ */
+ public ParserOptions getParserOptions() {
+ return ParserOptions.NONE;
+ }
+
+ /**
+ * @generated
+ */
+ public IParser getParser() {
+ if(parser == null) {
+ parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart.VISUAL_ID));
+ }
+ return parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected DirectEditManager getManager() {
+ if(manager == null) {
+ setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));
+ }
+ return manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void setManager(DirectEditManager manager) {
+ this.manager = manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit() {
+ getManager().show();
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit(Point eventLocation) {
+ if(getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private void performDirectEdit(char initialCharacter) {
+ if(getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager)getManager()).show(initialCharacter);
+ } else {
+ performDirectEdit();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEditRequest(Request request) {
+ final Request theRequest = request;
+ if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+ directEditionMode = getDirectEditionType();
+ }
+ 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) {
+ // Create default edit manager
+ 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));
+ setParser(((ICustomDirectEditorConfiguration)configuration).createParser(this.resolveSemanticElement()));
+ initializeDirectEditManager(theRequest);
+ return;
+ } 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(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);
+ } else {
+ return;
+ }
+ final Dialog finalDialog = dialog;
+ 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());
+ }
+ };
+ domain.getCommandStack().execute(command);
+ }
+ }
+ break;
+ case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+ initializeDirectEditManager(theRequest);
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void initializeDirectEditManager(final Request request) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ 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);
+ performDirectEdit(initialChar.charValue());
+ } else if((request instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest)request;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshLabel();
+ refreshFont();
+ refreshFontColor();
+ refreshUnderline();
+ refreshStrikeThrough();
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshLabel() {
+ EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+ if(maskLabelPolicy == null) {
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
+ }
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshUnderline() {
+ 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);
+ } else {
+ ((WrappingLabel)getFigure()).setTextUnderline(false);
+ }
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshStrikeThrough() {
+ FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+ }
+ }
+
+ /**
+ * @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));
+ setFont(fontData);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setFontColor(Color color) {
+ getFigure().setForegroundColor(color);
+ }
+
+ /**
+ * @generated
+ */
+ protected void addSemanticListeners() {
+ 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$
+ }
+ } else {
+ super.addSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeSemanticListeners() {
+ if(parserElements != null) {
+ for(int i = 0; i < parserElements.size(); i++) {
+ removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+ }
+ } else {
+ super.removeSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected AccessibleEditPart getAccessibleEditPart() {
+ if(accessibleEP == null) {
+ accessibleEP = new AccessibleGraphicalEditPart() {
+
+ public void getName(AccessibleEvent e) {
+ e.result = getLabelTextHelper(getFigure());
+ }
+ };
+ }
+ return accessibleEP;
+ }
+
+ /**
+ * @generated
+ */
+ private View getFontStyleOwnerView() {
+ return getPrimaryView();
+ }
+
+ /**
+ * Returns the kind of associated editor for direct edition.
+ *
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @generated
+ */
+ public int getDirectEditionType() {
+ if(checkExtendedEditor()) {
+ initExtendedEditorConfiguration();
+ return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+ }
+ if(checkDefaultEdition()) {
+ return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+ }
+ // not a named element. no specific editor => do nothing
+ return IDirectEdition.NO_DIRECT_EDITION;
+ }
+
+ /**
+ * Checks if an extended editor is present.
+ *
+ * @return <code>true</code> if an extended editor is present.
+ * @generated
+ */
+ protected boolean checkExtendedEditor() {
+ if(resolveSemanticElement() != null) {
+ return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ return false;
+ }
+
+ /**
+ * Checks if a default direct edition is available
+ *
+ * @return <code>true</code> if a default direct edition is available
+ * @generated
+ */
+ protected boolean checkDefaultEdition() {
+ return (getParser() != null);
+ }
+
+ /**
+ * Initializes the extended editor configuration
+ *
+ * @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().eClass().getInstanceClassName());
+ } else {
+ configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ }
+ }
+
+ /**
+ * Updates the preference configuration
+ *
+ * @generated
+ */
+ protected void updateExtendedEditorConfiguration() {
+ String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+ } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+ configuration = null;
+ }
+ }
+
+ /**
+ * Performs the direct edit usually used by GMF editors.
+ *
+ * @param theRequest
+ * the direct edit request that starts the direct edit system
+ * @generated
+ */
+ protected void performDefaultDirectEditorEdit(final Request theRequest) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ 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);
+ performDirectEdit(initialChar.charValue());
+ } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification event) {
+ Object feature = event.getFeature();
+ 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)) {
+ refreshUnderline();
+ } 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)) {
+ refreshFont();
+ } else {
+ if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+ refreshLabel();
+ }
+ if(getParser() instanceof ISemanticParser) {
+ ISemanticParser modelParser = (ISemanticParser)getParser();
+ if(modelParser.areSemanticElementsAffected(null, event)) {
+ removeSemanticListeners();
+ if(resolveSemanticElement() != null) {
+ addSemanticListeners();
+ }
+ refreshLabel();
+ }
+ }
+ }
+ super.handleNotificationEvent(event);
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigure() {
+ // Parent should assign one using setLabel() method
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ public String getLabelRole() {
+ return "Name";//$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ public String getIconPathRole() {
+ return "";//$NON-NLS-1$
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java index 001343db403..ad9a66b3fb3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -204,8 +204,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Constraint";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -358,6 +358,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -415,6 +418,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -463,6 +469,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -511,6 +520,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -559,6 +571,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
}
@@ -613,6 +628,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -661,6 +679,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -709,6 +730,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -734,6 +758,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -755,6 +780,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -772,6 +798,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -789,6 +816,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -806,6 +834,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -825,6 +854,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Comment_3074);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -842,6 +872,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -859,6 +890,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -902,6 +934,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -919,6 +952,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -936,6 +970,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -953,6 +988,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -970,6 +1006,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -993,6 +1030,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -1010,6 +1048,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -1024,15 +1063,15 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java index 97eb753fae0..d9ede4ebf71 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -204,8 +204,8 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Constraint";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -358,6 +358,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -415,6 +418,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -463,6 +469,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -511,6 +520,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -559,6 +571,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
}
@@ -613,6 +628,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -661,6 +679,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -709,6 +730,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -734,6 +758,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -755,6 +780,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -772,6 +798,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -789,6 +816,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -806,6 +834,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -825,6 +854,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Comment_3074);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -842,6 +872,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -859,6 +890,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -902,6 +934,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -919,6 +952,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -936,6 +970,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -953,6 +988,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -970,6 +1006,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -993,6 +1030,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -1010,6 +1048,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -1024,15 +1063,15 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java index 1b811fca96c..d5af8622e11 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;
@@ -192,8 +192,8 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "DefaultNamedElement";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -201,8 +201,8 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
@@ -216,8 +216,8 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { }
/**
- * Default implementation treats passed figure as content pane.
- * Respects layout one may have set for generated figure.
+ * Default implementation treats passed figure as content pane. Respects
+ * layout one may have set for generated figure.
*
* @param nodeShape
* instance of generated figure class
@@ -345,6 +345,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -402,6 +405,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -450,6 +456,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -498,6 +507,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -546,6 +558,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -594,6 +609,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -642,6 +660,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -667,6 +688,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -688,6 +710,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -705,6 +728,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -722,6 +746,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -739,6 +764,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -756,6 +782,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -773,6 +800,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -816,6 +844,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -833,6 +862,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -850,6 +880,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -867,6 +898,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -884,6 +916,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -907,6 +940,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -924,6 +958,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -938,15 +973,15 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java index 18617b9b211..f5822daa3af 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java @@ -596,7 +596,9 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java index ebbbb4391b1..3bc72bfc3f3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java @@ -51,8 +51,8 @@ public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implemen /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java index c54546523b0..652f5382380 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java @@ -47,8 +47,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
@@ -168,8 +168,8 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "DependencyNode";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -177,8 +177,8 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
@@ -192,8 +192,8 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { }
/**
- * Default implementation treats passed figure as content pane.
- * Respects layout one may have set for generated figure.
+ * Default implementation treats passed figure as content pane. Respects
+ * layout one may have set for generated figure.
*
* @param nodeShape
* instance of generated figure class
@@ -316,6 +316,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -373,6 +376,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -421,6 +427,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -469,6 +478,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -517,6 +529,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -565,6 +580,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -613,6 +631,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -638,6 +659,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -659,6 +681,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -676,6 +699,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -693,6 +717,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -710,6 +735,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -727,6 +753,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -744,6 +771,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -787,6 +815,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -804,6 +833,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -821,6 +851,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -838,6 +869,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -855,6 +887,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -878,6 +911,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -895,6 +929,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -944,15 +979,15 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java index 7bfc6458433..f38a4d351f0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.parts;
import org.eclipse.draw2d.geometry.Dimension;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java index f3fd700d58f..62fe7bf788f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java @@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -166,8 +166,8 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "NamedElement";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -314,6 +314,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -371,6 +374,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -419,6 +425,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -467,6 +476,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -515,6 +527,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -563,6 +578,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -611,6 +629,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -636,6 +657,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -657,6 +679,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -674,6 +697,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -691,6 +715,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -708,6 +733,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -725,6 +751,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -742,6 +769,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -785,6 +813,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -802,6 +831,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -819,6 +849,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -836,6 +867,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -853,6 +885,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -876,6 +909,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -893,6 +927,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -907,15 +942,15 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java index ff75a72372e..b3c4fa8acea 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java @@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
@@ -168,8 +168,8 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Interface";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -317,6 +317,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -392,6 +395,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -440,6 +446,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -488,6 +497,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -536,6 +548,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -584,6 +599,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -632,6 +650,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -657,6 +678,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -685,6 +707,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -702,6 +725,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -719,6 +743,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -736,6 +761,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -753,6 +779,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -770,6 +797,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -815,6 +843,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -832,6 +861,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Generalization_4003) {
types.add(UMLElementTypes.Component_2002);
types.add(UMLElementTypes.Interface_3205);
@@ -856,6 +886,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -873,6 +904,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -890,6 +922,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -907,6 +940,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -930,6 +964,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -947,6 +982,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -961,15 +997,15 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java index 16f64908f78..cfc9114ee90 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.parts;
import org.eclipse.draw2d.geometry.Dimension;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java index 9ebbbae9b4b..1a3b937abeb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.parts;
import org.eclipse.draw2d.Connection;
@@ -38,8 +41,8 @@ public class InterfacePortLinkEditPart extends ConnectionEditPart implements ITr /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java index 45ba7d5e800..caa5cd7e27a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -215,8 +215,8 @@ public class ModelEditPart extends NamedElementEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Model";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -224,8 +224,8 @@ public class ModelEditPart extends NamedElementEditPart { /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
@@ -239,8 +239,8 @@ public class ModelEditPart extends NamedElementEditPart { }
/**
- * Default implementation treats passed figure as content pane.
- * Respects layout one may have set for generated figure.
+ * Default implementation treats passed figure as content pane. Respects
+ * layout one may have set for generated figure.
*
* @param nodeShape
* instance of generated figure class
@@ -368,6 +368,9 @@ public class ModelEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -425,6 +428,9 @@ public class ModelEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -473,6 +479,9 @@ public class ModelEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -521,6 +530,9 @@ public class ModelEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -569,6 +581,9 @@ public class ModelEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -617,6 +632,9 @@ public class ModelEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -665,6 +683,9 @@ public class ModelEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -690,6 +711,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -711,6 +733,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -728,6 +751,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -745,6 +769,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -762,6 +787,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -779,6 +805,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -796,6 +823,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -839,6 +867,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -856,6 +885,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -873,6 +903,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -890,6 +921,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -907,6 +939,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -930,6 +963,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -947,6 +981,7 @@ public class ModelEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -961,15 +996,15 @@ public class ModelEditPart extends NamedElementEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java index 033bfa89374..c213784778b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
@@ -205,8 +205,8 @@ public class ModelEditPartCN extends ShapeNodeEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Model";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -214,8 +214,8 @@ public class ModelEditPartCN extends ShapeNodeEditPart { /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
@@ -229,8 +229,8 @@ public class ModelEditPartCN extends ShapeNodeEditPart { }
/**
- * Default implementation treats passed figure as content pane.
- * Respects layout one may have set for generated figure.
+ * Default implementation treats passed figure as content pane. Respects
+ * layout one may have set for generated figure.
*
* @param nodeShape
* instance of generated figure class
@@ -358,6 +358,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -415,6 +418,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -463,6 +469,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -511,6 +520,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -559,6 +571,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -607,6 +622,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -655,6 +673,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -680,6 +701,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -701,6 +723,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -718,6 +741,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -735,6 +759,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -752,6 +777,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -769,6 +795,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -786,6 +813,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -829,6 +857,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -846,6 +875,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -863,6 +893,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -880,6 +911,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -897,6 +929,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -920,6 +953,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -937,6 +971,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -951,15 +986,15 @@ public class ModelEditPartCN extends ShapeNodeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java index 023204b8bad..f121eeb2cf1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java @@ -610,7 +610,9 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java index a9892f76a02..56c1dfc543c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java @@ -610,7 +610,9 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java index bc52781b34a..637d3a2bc1c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java @@ -626,7 +626,9 @@ public class MultiDependencyLabelEditPart extends LabelEditPart implements IText /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java index 16320014923..53c0e3f40c8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java @@ -621,7 +621,9 @@ public class OperationForInterfaceEditPart extends UMLCompartmentEditPart implem /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java index 03327433c09..73b245b0870 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
@@ -215,8 +215,8 @@ public class PackageEditPart extends NamedElementEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Package";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -368,6 +368,9 @@ public class PackageEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -425,6 +428,9 @@ public class PackageEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -473,6 +479,9 @@ public class PackageEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -521,6 +530,9 @@ public class PackageEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -569,6 +581,9 @@ public class PackageEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -617,6 +632,9 @@ public class PackageEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -665,6 +683,9 @@ public class PackageEditPart extends NamedElementEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -690,6 +711,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -711,6 +733,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -728,6 +751,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -745,6 +769,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -762,6 +787,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -779,6 +805,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -796,6 +823,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -839,6 +867,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -856,6 +885,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -873,6 +903,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -890,6 +921,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -907,6 +939,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -930,6 +963,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -947,6 +981,7 @@ public class PackageEditPart extends NamedElementEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -961,15 +996,15 @@ public class PackageEditPart extends NamedElementEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java index ec872bb5ecf..1091bac1f6e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java @@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
@@ -205,8 +205,8 @@ public class PackageEditPartCN extends ShapeNodeEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Package";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -214,8 +214,8 @@ public class PackageEditPartCN extends ShapeNodeEditPart { /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
@@ -229,8 +229,8 @@ public class PackageEditPartCN extends ShapeNodeEditPart { }
/**
- * Default implementation treats passed figure as content pane.
- * Respects layout one may have set for generated figure.
+ * Default implementation treats passed figure as content pane. Respects
+ * layout one may have set for generated figure.
*
* @param nodeShape
* instance of generated figure class
@@ -358,6 +358,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -415,6 +418,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -463,6 +469,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -511,6 +520,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -559,6 +571,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -607,6 +622,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -655,6 +673,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -680,6 +701,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -701,6 +723,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -718,6 +741,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -735,6 +759,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -752,6 +777,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -769,6 +795,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -786,6 +813,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -829,6 +857,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -846,6 +875,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -863,6 +893,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -880,6 +911,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -897,6 +929,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -920,6 +953,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -937,6 +971,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -951,15 +986,15 @@ public class PackageEditPartCN extends ShapeNodeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java index 0b82a871b44..09f88b6174a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java @@ -610,7 +610,9 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java index 38345c26c45..27620f879ae 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java @@ -48,8 +48,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
@@ -207,8 +207,8 @@ public class PortEditPart extends AbstractBorderEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Port";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
//FIXME: workaround for #154536
result.getBounds().setSize(result.getPreferredSize());
@@ -357,6 +357,9 @@ public class PortEditPart extends AbstractBorderEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -414,6 +417,9 @@ public class PortEditPart extends AbstractBorderEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -462,6 +468,9 @@ public class PortEditPart extends AbstractBorderEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -510,6 +519,9 @@ public class PortEditPart extends AbstractBorderEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -558,6 +570,9 @@ public class PortEditPart extends AbstractBorderEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -606,6 +621,9 @@ public class PortEditPart extends AbstractBorderEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -654,6 +672,9 @@ public class PortEditPart extends AbstractBorderEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -679,6 +700,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -700,6 +722,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -717,6 +740,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -734,6 +758,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -751,6 +776,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -768,6 +794,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -785,6 +812,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -828,6 +856,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Substitution_4012) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -845,6 +874,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -862,6 +892,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -879,6 +910,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -896,6 +928,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -919,6 +952,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -936,6 +970,7 @@ public class PortEditPart extends AbstractBorderEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -950,15 +985,15 @@ public class PortEditPart extends AbstractBorderEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java index cfc97da9df6..23043ae73a6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java @@ -621,7 +621,9 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart impleme /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java new file mode 100644 index 00000000000..8fcfa2c504b --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java @@ -0,0 +1,1038 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.parts;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.Shape;
+import org.eclipse.draw2d.StackLayout;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.editpolicies.LayoutEditPolicy;
+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
+import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLayoutEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.PropertyPartItemSemanticEditPolicyCN;
+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure;
+import org.eclipse.papyrus.uml.diagram.component.custom.locators.PortPositionLocator;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.swt.graphics.Color;
+
+/**
+ * @generated
+ */
+public class PropertyPartEditPartCN extends org.eclipse.papyrus.uml.diagram.component.custom.edit.part.PropertyPartEditPartCN {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 3079;
+
+ /**
+ * @generated
+ */
+ protected IFigure contentPane;
+
+ /**
+ * @generated
+ */
+ protected IFigure primaryShape;
+
+ /**
+ * @generated
+ */
+ public PropertyPartEditPartCN(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyItemSemanticEditPolicy());
+ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
+ //in Papyrus diagrams are not strongly synchronised
+ //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyCanonicalEditPolicy());
+ installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
+ installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartItemSemanticEditPolicyCN());
+ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
+ installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
+ installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
+ installEditPolicy(EditPolicy.LAYOUT_ROLE, new PropertyLayoutEditPolicy());
+ installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
+ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
+ // 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);
+ }
+
+ /**
+ * Papyrus codeGen
+ *
+ * @generated
+ **/
+ protected void handleNotificationEvent(Notification event) {
+ super.handleNotificationEvent(event);
+ }
+
+ /**
+ * @generated
+ */
+ protected LayoutEditPolicy createLayoutEditPolicy() {
+ org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
+
+ protected EditPolicy createChildEditPolicy(EditPart child) {
+ View childView = (View)child.getModel();
+ switch(UMLVisualIDRegistry.getVisualID(childView)) {
+ case PortEditPart.VISUAL_ID:
+ return new BorderItemResizableEditPolicy();
+ }
+ EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(result == null) {
+ result = new NonResizableEditPolicy();
+ }
+ return result;
+ }
+
+ protected Command getMoveChildrenCommand(Request request) {
+ return null;
+ }
+
+ protected Command getCreateCommand(CreateRequest request) {
+ return null;
+ }
+ };
+ return lep;
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createNodeShape() {
+ return primaryShape = new PropertyPartFigure();
+ }
+
+ /**
+ * @generated
+ */
+ public PropertyPartFigure getPrimaryShape() {
+ return (PropertyPartFigure)primaryShape;
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean addFixedChild(EditPart childEditPart) {
+ if(childEditPart instanceof PropertyPartNameEditPartCN) {
+ ((PropertyPartNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());
+ return true;
+ }
+ //Papyrus Gencode :Affixed Port locator
+ if(childEditPart instanceof PortEditPart) {
+ IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
+ getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean removeFixedChild(EditPart childEditPart) {
+ if(childEditPart instanceof PropertyPartNameEditPartCN) {
+ return true;
+ }
+ if(childEditPart instanceof PortEditPart) {
+ getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ protected void addChildVisual(EditPart childEditPart, int index) {
+ if(addFixedChild(childEditPart)) {
+ return;
+ }
+ super.addChildVisual(childEditPart, -1);
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeChildVisual(EditPart childEditPart) {
+ if(removeFixedChild(childEditPart)) {
+ return;
+ }
+ super.removeChildVisual(childEditPart);
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
+ if(editPart instanceof IBorderItemEditPart) {
+ return getBorderedFigure().getBorderItemContainer();
+ }
+ return getContentPane();
+ }
+
+ /**
+ * @generated
+ */
+ protected NodeFigure createNodePlate() {
+ String prefElementId = "Property";
+ IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
+ DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
+ return result;
+ }
+
+ /**
+ * Creates figure for this edit part.
+ *
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
+ *
+ * @generated
+ */
+ protected NodeFigure createMainFigure() {
+ NodeFigure figure = createNodePlate();
+ figure.setLayoutManager(new StackLayout());
+ IFigure shape = createNodeShape();
+ figure.add(shape);
+ contentPane = setupContentPane(shape);
+ return figure;
+ }
+
+ /**
+ * Default implementation treats passed figure as content pane. Respects
+ * layout one may have set for generated figure.
+ *
+ * @param nodeShape
+ * instance of generated figure class
+ * @generated
+ */
+ protected IFigure setupContentPane(IFigure nodeShape) {
+ if(nodeShape.getLayoutManager() == null) {
+ ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
+ layout.setSpacing(5);
+ nodeShape.setLayoutManager(layout);
+ }
+ return nodeShape; // use nodeShape itself as contentPane
+ }
+
+ /**
+ * @generated
+ */
+ public IFigure getContentPane() {
+ if(contentPane != null) {
+ return contentPane;
+ }
+ return super.getContentPane();
+ }
+
+ /**
+ * @generated
+ */
+ protected void setForegroundColor(Color color) {
+ if(primaryShape != null) {
+ primaryShape.setForegroundColor(color);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLineWidth(int width) {
+ if(primaryShape instanceof Shape) {
+ ((Shape)primaryShape).setLineWidth(width);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setLineType(int style) {
+ if(primaryShape instanceof Shape) {
+ ((Shape)primaryShape).setLineStyle(style);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public EditPart getPrimaryChildEditPart() {
+ return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));
+ }
+
+ /**
+ * @generated
+ */
+ public List<IElementType> getMARelTypesOnSource() {
+ ArrayList<IElementType> types = new ArrayList<IElementType>(8);
+ types.add(UMLElementTypes.Usage_4001);
+ types.add(UMLElementTypes.InterfaceRealization_4006);
+ types.add(UMLElementTypes.Substitution_4012);
+ types.add(UMLElementTypes.Manifestation_4014);
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ types.add(UMLElementTypes.Abstraction_4013);
+ types.add(UMLElementTypes.Dependency_4010);
+ types.add(UMLElementTypes.Dependency_4017);
+ return types;
+ }
+
+ /**
+ * @generated
+ */
+ public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {
+ LinkedList<IElementType> types = new LinkedList<IElementType>();
+ if(targetEditPart instanceof DependencyNodeEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof ComponentEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof ModelEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof PackageEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof DefaultNamedElementEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof ModelEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof PackageEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof ComponentEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof ComponentEditPartPCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof ConstraintEditPartPCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof InterfaceEditPartPCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPart) {
+ types.add(UMLElementTypes.InterfaceRealization_4006);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+ types.add(UMLElementTypes.InterfaceRealization_4006);
+ }
+ if(targetEditPart instanceof InterfaceEditPartPCN) {
+ types.add(UMLElementTypes.InterfaceRealization_4006);
+ }
+ if(targetEditPart instanceof DependencyNodeEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof ComponentEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof ModelEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof PackageEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof DefaultNamedElementEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof ModelEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof PackageEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof ComponentEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof ComponentEditPartPCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof ConstraintEditPartPCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof InterfaceEditPartPCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
+ if(targetEditPart instanceof DependencyNodeEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof ComponentEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof ModelEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof PackageEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof DefaultNamedElementEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof ModelEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof PackageEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof ComponentEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof ComponentEditPartPCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof ConstraintEditPartPCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof InterfaceEditPartPCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
+ if(targetEditPart instanceof DependencyNodeEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof ComponentEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof ModelEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof PackageEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof DefaultNamedElementEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof ModelEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof PackageEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof ComponentEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof ComponentEditPartPCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof ConstraintEditPartPCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof InterfaceEditPartPCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
+ if(targetEditPart instanceof DependencyNodeEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof ComponentEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof ModelEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof PackageEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof DefaultNamedElementEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof ModelEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof PackageEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof ComponentEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof ComponentEditPartPCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof ConstraintEditPartPCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof InterfaceEditPartPCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
+ if(targetEditPart instanceof DependencyNodeEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof ComponentEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof ModelEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof PackageEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof DefaultNamedElementEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof ModelEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof PackageEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof ComponentEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof ComponentEditPartPCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof ConstraintEditPartPCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof InterfaceEditPartPCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
+ if(targetEditPart instanceof DependencyNodeEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof ComponentEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof ModelEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof PackageEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof ConstraintEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof DefaultNamedElementEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof InterfaceEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof PortEditPart) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof ModelEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof PackageEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof RectangleInterfaceEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof ComponentEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof ComponentEditPartPCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof ConstraintEditPartPCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof InterfaceEditPartPCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
+ return types;
+ }
+
+ /**
+ * @generated
+ */
+ public List<IElementType> getMATypesForTarget(IElementType relationshipType) {
+ LinkedList<IElementType> types = new LinkedList<IElementType>();
+ if(relationshipType == UMLElementTypes.Usage_4001) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Interface_3072);
+ } else if(relationshipType == UMLElementTypes.Substitution_4012) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.Manifestation_4014) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.Abstraction_4013) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.Dependency_4010) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.Dependency_4017) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ }
+ return types;
+ }
+
+ /**
+ * @generated
+ */
+ public List<IElementType> getMARelTypesOnTarget() {
+ ArrayList<IElementType> types = new ArrayList<IElementType>(9);
+ types.add(UMLElementTypes.Usage_4001);
+ types.add(UMLElementTypes.Substitution_4012);
+ types.add(UMLElementTypes.Manifestation_4014);
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ types.add(UMLElementTypes.Abstraction_4013);
+ types.add(UMLElementTypes.CommentAnnotatedElement_4015);
+ types.add(UMLElementTypes.ConstraintConstrainedElement_4009);
+ types.add(UMLElementTypes.Dependency_4010);
+ types.add(UMLElementTypes.Dependency_4017);
+ return types;
+ }
+
+ /**
+ * @generated
+ */
+ public List<IElementType> getMATypesForSource(IElementType relationshipType) {
+ LinkedList<IElementType> types = new LinkedList<IElementType>();
+ if(relationshipType == UMLElementTypes.Usage_4001) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.Substitution_4012) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.Manifestation_4014) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.Abstraction_4013) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
+ types.add(UMLElementTypes.Comment_3201);
+ types.add(UMLElementTypes.Comment_3074);
+ } else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.Constraint_3075);
+ } else if(relationshipType == UMLElementTypes.Dependency_4010) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ } else if(relationshipType == UMLElementTypes.Dependency_4017) {
+ types.add(UMLElementTypes.Dependency_3203);
+ types.add(UMLElementTypes.Component_2002);
+ types.add(UMLElementTypes.Model_3202);
+ types.add(UMLElementTypes.Package_3200);
+ types.add(UMLElementTypes.Interface_3205);
+ types.add(UMLElementTypes.Constraint_3199);
+ types.add(UMLElementTypes.NamedElement_3204);
+ types.add(UMLElementTypes.NamedElement_2003);
+ types.add(UMLElementTypes.Port_3069);
+ types.add(UMLElementTypes.Model_3077);
+ types.add(UMLElementTypes.Package_3076);
+ types.add(UMLElementTypes.Interface_3078);
+ types.add(UMLElementTypes.Component_3070);
+ types.add(UMLElementTypes.Component_3071);
+ types.add(UMLElementTypes.Constraint_3075);
+ types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
+ }
+ return types;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public Object getPreferredValue(EStructuralFeature feature) {
+ IPreferenceStore preferenceStore = (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore();
+ Object result = null;
+ if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
+ String prefColor = null;
+ if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
+ prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_LINE);
+ } else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
+ prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_FONT);
+ } else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
+ prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_FILL);
+ }
+ result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
+ } else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_GRADIENT);
+ GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
+ if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
+ result = new Integer(gradientPreferenceConverter.getTransparency());
+ } else if(feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
+ result = gradientPreferenceConverter.getGradientData();
+ }
+ }
+ if(result == null) {
+ result = getStructuralFeatureValue(feature);
+ }
+ return result;
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java new file mode 100644 index 00000000000..3353d90c10f --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java @@ -0,0 +1,810 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+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;
+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart {
+
+ /**
+ * @generated
+ */
+ public static final int VISUAL_ID = 5268;
+
+ /**
+ * @generated
+ */
+ private DirectEditManager manager;
+
+ /**
+ * @generated
+ */
+ private IParser parser;
+
+ /**
+ * @generated
+ */
+ private List<?> parserElements;
+
+ /**
+ * @generated
+ */
+ private String defaultText;
+
+ /**
+ * direct edition mode (default, undefined, registered editor, etc.)
+ *
+ * @generated
+ */
+ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+ /**
+ * configuration from a registered edit dialog
+ *
+ * @generated
+ */
+ protected IDirectEditorConfiguration configuration;
+
+ /**
+ * @generated
+ */
+ public PropertyPartNameEditPartCN(View view) {
+ super(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void createDefaultEditPolicies() {
+ super.createDefaultEditPolicies();
+ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+ installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
+ installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy());
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelTextHelper(IFigure figure) {
+ if(figure instanceof WrappingLabel) {
+ return ((WrappingLabel)figure).getText();
+ } else if(figure instanceof ILabelFigure) {
+ return ((ILabelFigure)figure).getText();
+ } else {
+ return ((Label)figure).getText();
+ }
+ }
+
+ /**
+ * @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);
+ } else {
+ ((Label)figure).setText(text);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIconHelper(IFigure figure) {
+ if(figure instanceof WrappingLabel) {
+ return ((WrappingLabel)figure).getIcon();
+ } else if(figure instanceof ILabelFigure) {
+ return ((ILabelFigure)figure).getIcon();
+ } else {
+ return ((Label)figure).getIcon();
+ }
+ }
+
+ /**
+ * @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);
+ } else {
+ ((Label)figure).setIcon(icon);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabel(WrappingLabel figure) {
+ unregisterVisuals();
+ setFigure(figure);
+ defaultText = getLabelTextHelper(figure);
+ registerVisuals();
+ refreshVisuals();
+ }
+
+ /**
+ * @generated
+ */
+ protected List getModelChildren() {
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * @generated
+ */
+ public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ public void setParser(IParser parser) {
+ this.parser = parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected EObject getParserElement() {
+ return resolveSemanticElement();
+ }
+
+ /**
+ * @generated
+ */
+ protected Image getLabelIcon() {
+ EObject parserElement = getParserElement();
+ if(parserElement == null) {
+ return null;
+ }
+ List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
+ for(View view : views) {
+ if(NameLabelIconHelper.showLabelIcon(view)) {
+ return UMLElementTypes.getImage(parserElement.eClass());
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected String getLabelText() {
+ String text = null;
+ EObject parserElement = getParserElement();
+ if(parserElement != null && getParser() != null) {
+ text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());
+ }
+ if(text == null || text.length() == 0) {
+ text = defaultText;
+ }
+ return text;
+ }
+
+ /**
+ * @generated
+ */
+ public void setLabelText(String text) {
+ setLabelTextHelper(getFigure(), text);
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ public String getEditText() {
+ if(getParserElement() == null || getParser() == null) {
+ return ""; //$NON-NLS-1$
+ }
+ return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean isEditable() {
+ return getParser() != null;
+ }
+
+ /**
+ * @generated
+ */
+ public ICellEditorValidator getEditTextValidator() {
+ return new ICellEditorValidator() {
+
+ public String isValid(final Object value) {
+ if(value instanceof String) {
+ final EObject element = getParserElement();
+ final IParser parser = getParser();
+ try {
+ IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
+
+ public void run() {
+ setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));
+ }
+ });
+ return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
+ } catch (InterruptedException ie) {
+ ie.printStackTrace();
+ }
+ }
+ // shouldn't get here
+ return null;
+ }
+ };
+ }
+
+ /**
+ * @generated
+ */
+ public IContentAssistProcessor getCompletionProcessor() {
+ if(getParserElement() == null || getParser() == null) {
+ return null;
+ }
+ return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+ }
+
+ /**
+ * @generated
+ */
+ public ParserOptions getParserOptions() {
+ return ParserOptions.NONE;
+ }
+
+ /**
+ * @generated
+ */
+ public IParser getParser() {
+ if(parser == null) {
+ parser = UMLParserProvider.getParser(UMLElementTypes.Property_3079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN.VISUAL_ID));
+ }
+ return parser;
+ }
+
+ /**
+ * @generated
+ */
+ protected DirectEditManager getManager() {
+ if(manager == null) {
+ setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));
+ }
+ return manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void setManager(DirectEditManager manager) {
+ this.manager = manager;
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit() {
+ getManager().show();
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEdit(Point eventLocation) {
+ if(getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
+ }
+ }
+
+ /**
+ * @generated
+ */
+ private void performDirectEdit(char initialCharacter) {
+ if(getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager)getManager()).show(initialCharacter);
+ } else {
+ performDirectEdit();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void performDirectEditRequest(Request request) {
+ final Request theRequest = request;
+ if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+ directEditionMode = getDirectEditionType();
+ }
+ 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) {
+ // Create default edit manager
+ 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));
+ setParser(((ICustomDirectEditorConfiguration)configuration).createParser(this.resolveSemanticElement()));
+ initializeDirectEditManager(theRequest);
+ return;
+ } 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(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);
+ } else {
+ return;
+ }
+ final Dialog finalDialog = dialog;
+ 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());
+ }
+ };
+ domain.getCommandStack().execute(command);
+ }
+ }
+ break;
+ case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+ initializeDirectEditManager(theRequest);
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void initializeDirectEditManager(final Request request) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ 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);
+ performDirectEdit(initialChar.charValue());
+ } else if((request instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest)request;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshLabel();
+ refreshFont();
+ refreshFontColor();
+ refreshUnderline();
+ refreshStrikeThrough();
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshLabel() {
+ EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+ if(maskLabelPolicy == null) {
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
+ }
+ Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();
+ }
+ Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+ if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+ ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshUnderline() {
+ 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);
+ } else {
+ ((WrappingLabel)getFigure()).setTextUnderline(false);
+ }
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshStrikeThrough() {
+ FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ if(style != null && getFigure() instanceof WrappingLabel) {
+ ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+ }
+ }
+
+ /**
+ * @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));
+ setFont(fontData);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void setFontColor(Color color) {
+ getFigure().setForegroundColor(color);
+ }
+
+ /**
+ * @generated
+ */
+ protected void addSemanticListeners() {
+ 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$
+ }
+ } else {
+ super.addSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeSemanticListeners() {
+ if(parserElements != null) {
+ for(int i = 0; i < parserElements.size(); i++) {
+ removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+ }
+ } else {
+ super.removeSemanticListeners();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected AccessibleEditPart getAccessibleEditPart() {
+ if(accessibleEP == null) {
+ accessibleEP = new AccessibleGraphicalEditPart() {
+
+ public void getName(AccessibleEvent e) {
+ e.result = getLabelTextHelper(getFigure());
+ }
+ };
+ }
+ return accessibleEP;
+ }
+
+ /**
+ * @generated
+ */
+ private View getFontStyleOwnerView() {
+ return (View)getModel();
+ }
+
+ /**
+ * Returns the kind of associated editor for direct edition.
+ *
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @generated
+ */
+ public int getDirectEditionType() {
+ if(checkExtendedEditor()) {
+ initExtendedEditorConfiguration();
+ return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+ }
+ if(checkDefaultEdition()) {
+ return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+ }
+ // not a named element. no specific editor => do nothing
+ return IDirectEdition.NO_DIRECT_EDITION;
+ }
+
+ /**
+ * Checks if an extended editor is present.
+ *
+ * @return <code>true</code> if an extended editor is present.
+ * @generated
+ */
+ protected boolean checkExtendedEditor() {
+ if(resolveSemanticElement() != null) {
+ return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ return false;
+ }
+
+ /**
+ * Checks if a default direct edition is available
+ *
+ * @return <code>true</code> if a default direct edition is available
+ * @generated
+ */
+ protected boolean checkDefaultEdition() {
+ return (getParser() != null);
+ }
+
+ /**
+ * Initializes the extended editor configuration
+ *
+ * @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().eClass().getInstanceClassName());
+ } else {
+ configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+ }
+ }
+ }
+
+ /**
+ * Updates the preference configuration
+ *
+ * @generated
+ */
+ protected void updateExtendedEditorConfiguration() {
+ String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+ if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
+ configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+ } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+ configuration = null;
+ }
+ }
+
+ /**
+ * Performs the direct edit usually used by GMF editors.
+ *
+ * @param theRequest
+ * the direct edit request that starts the direct edit system
+ * @generated
+ */
+ protected void performDefaultDirectEditorEdit(final Request theRequest) {
+ // initialize the direct edit manager
+ try {
+ getEditingDomain().runExclusive(new Runnable() {
+
+ 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);
+ performDirectEdit(initialChar.charValue());
+ } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+ DirectEditRequest editRequest = (DirectEditRequest)theRequest;
+ performDirectEdit(editRequest.getLocation());
+ } else {
+ performDirectEdit();
+ }
+ }
+ }
+ });
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected void addNotationalListeners() {
+ super.addNotationalListeners();
+ addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeNotationalListeners() {
+ super.removeNotationalListeners();
+ removeListenerFilter("PrimaryView"); //$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ protected void handleNotificationEvent(Notification event) {
+ refreshLabel();
+ Object feature = event.getFeature();
+ 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)) {
+ refreshUnderline();
+ } 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)) {
+ refreshFont();
+ } else {
+ if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+ refreshLabel();
+ }
+ if(getParser() instanceof ISemanticParser) {
+ ISemanticParser modelParser = (ISemanticParser)getParser();
+ if(modelParser.areSemanticElementsAffected(null, event)) {
+ removeSemanticListeners();
+ if(resolveSemanticElement() != null) {
+ addSemanticListeners();
+ }
+ refreshLabel();
+ }
+ }
+ }
+ if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {
+ refreshLabel();
+ }
+ super.handleNotificationEvent(event);
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure createFigure() {
+ // Parent should assign one using setLabel() method
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ private static final String ADD_PARENT_MODEL = "AddParentModel";
+
+ /**
+ * @generated
+ */
+ public void activate() {
+ super.activate();
+ addOwnerElementListeners();
+ }
+
+ /**
+ * @generated
+ */
+ protected void addOwnerElementListeners() {
+ addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$
+ }
+
+ /**
+ * @generated
+ */
+ public void deactivate() {
+ removeOwnerElementListeners();
+ super.deactivate();
+ }
+
+ /**
+ * @generated
+ */
+ protected void removeOwnerElementListeners() {
+ removeListenerFilter(ADD_PARENT_MODEL);
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java index 025e857eca5..10f6179e03f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java @@ -616,7 +616,9 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart implements /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java index 99fb1c403ce..cb7322b0900 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java @@ -41,8 +41,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
@@ -216,8 +216,8 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Interface";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -225,8 +225,8 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
@@ -240,8 +240,8 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { }
/**
- * Default implementation treats passed figure as content pane.
- * Respects layout one may have set for generated figure.
+ * Default implementation treats passed figure as content pane. Respects
+ * layout one may have set for generated figure.
*
* @param nodeShape
* instance of generated figure class
@@ -370,6 +370,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -445,6 +448,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -493,6 +499,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -541,6 +550,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -589,6 +601,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -637,6 +652,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -685,6 +703,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -710,6 +731,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -738,6 +760,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -755,6 +778,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -772,6 +796,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -789,6 +814,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -806,6 +832,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -823,6 +850,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -868,6 +896,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -885,6 +914,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Generalization_4003) {
types.add(UMLElementTypes.Component_2002);
types.add(UMLElementTypes.Interface_3205);
@@ -909,6 +939,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -926,6 +957,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -943,6 +975,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -960,6 +993,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -983,6 +1017,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -1000,6 +1035,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -1034,15 +1070,15 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java index 3df6c9cee5d..40449ec65b0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.parts;
import java.util.ArrayList;
@@ -29,8 +32,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
@@ -204,8 +207,8 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { protected NodeFigure createNodePlate() {
String prefElementId = "Interface";
IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
- String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
- String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+ String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+ String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
return result;
}
@@ -213,8 +216,8 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { /**
* Creates figure for this edit part.
*
- * Body of this method does not depend on settings in generation model
- * so you may safely remove <i>generated</i> tag and modify it.
+ * Body of this method does not depend on settings in generation model so
+ * you may safely remove <i>generated</i> tag and modify it.
*
* @generated
*/
@@ -228,8 +231,8 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { }
/**
- * Default implementation treats passed figure as content pane.
- * Respects layout one may have set for generated figure.
+ * Default implementation treats passed figure as content pane. Respects
+ * layout one may have set for generated figure.
*
* @param nodeShape
* instance of generated figure class
@@ -358,6 +361,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Usage_4001);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Usage_4001);
+ }
if(targetEditPart instanceof RectangleInterfaceEditPart) {
types.add(UMLElementTypes.InterfaceRealization_4006);
}
@@ -433,6 +439,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Substitution_4012);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Substitution_4012);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Manifestation_4014);
}
@@ -481,6 +490,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Manifestation_4014);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Manifestation_4014);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
@@ -529,6 +541,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.ComponentRealization_4007);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.ComponentRealization_4007);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Abstraction_4013);
}
@@ -577,6 +592,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Abstraction_4013);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Abstraction_4013);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4010);
}
@@ -625,6 +643,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4010);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4010);
+ }
if(targetEditPart instanceof DependencyNodeEditPart) {
types.add(UMLElementTypes.Dependency_4017);
}
@@ -673,6 +694,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { if(targetEditPart instanceof InterfaceEditPartPCN) {
types.add(UMLElementTypes.Dependency_4017);
}
+ if(targetEditPart instanceof PropertyPartEditPartCN) {
+ types.add(UMLElementTypes.Dependency_4017);
+ }
return types;
}
@@ -698,6 +722,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Interface_3205);
types.add(UMLElementTypes.Interface_3078);
@@ -726,6 +751,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -743,6 +769,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -760,6 +787,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -777,6 +805,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4010) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -794,6 +823,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -811,6 +841,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -856,6 +887,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -873,6 +905,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Generalization_4003) {
types.add(UMLElementTypes.Component_2002);
types.add(UMLElementTypes.Interface_3205);
@@ -897,6 +930,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Manifestation_4014) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -914,6 +948,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -931,6 +966,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Abstraction_4013) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -948,6 +984,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {
types.add(UMLElementTypes.Comment_3201);
types.add(UMLElementTypes.Comment_3074);
@@ -971,6 +1008,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
} else if(relationshipType == UMLElementTypes.Dependency_4017) {
types.add(UMLElementTypes.Dependency_3203);
types.add(UMLElementTypes.Component_2002);
@@ -988,6 +1026,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { types.add(UMLElementTypes.Component_3071);
types.add(UMLElementTypes.Constraint_3075);
types.add(UMLElementTypes.Interface_3072);
+ types.add(UMLElementTypes.Property_3079);
}
return types;
}
@@ -1022,15 +1061,15 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java index bcd0fbb634d..e8e000fd125 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java @@ -611,7 +611,9 @@ public class RectangleInterfaceNameEditPart extends PapyrusCompartmentEditPart i /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java index ccb70a7b1b3..dfedbe7b9e5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.parts;
import java.util.Collections;
@@ -584,7 +587,9 @@ public class RectangleInterfaceNameEditPartCN extends PapyrusCompartmentEditPart /**
* Returns the kind of associated editor for direct edition.
*
- * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+ * @return an <code>int</code> corresponding to the kind of direct editor, @see
+ * org
+ * .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
* @generated
*/
public int getDirectEditionType() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java index c3342f3b831..dc138a60512 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java @@ -124,6 +124,10 @@ public class UMLEditPartFactory implements EditPartFactory { return new InterfaceEditPartPCN(view);
case InterfaceNameEditPartPCN.VISUAL_ID:
return new InterfaceNameEditPartPCN(view);
+ case PropertyPartEditPartCN.VISUAL_ID:
+ return new PropertyPartEditPartCN(view);
+ case PropertyPartNameEditPartCN.VISUAL_ID:
+ return new PropertyPartNameEditPartCN(view);
case ComponentCompositeCompartmentEditPart.VISUAL_ID:
return new ComponentCompositeCompartmentEditPart(view);
case ModelPackageableElementCompartmentEditPart.VISUAL_ID:
@@ -194,6 +198,12 @@ public class UMLEditPartFactory implements EditPartFactory { return new DependencyBranchEditPart(view);
case InterfacePortLinkEditPart.VISUAL_ID:
return new InterfacePortLinkEditPart(view);
+ case ConnectorEditPart.VISUAL_ID:
+ return new ConnectorEditPart(view);
+ case ConnectorAppliedStereotypeEditPart.VISUAL_ID:
+ return new ConnectorAppliedStereotypeEditPart(view);
+ case ConnectorNameEditPart.VISUAL_ID:
+ return new ConnectorNameEditPart(view);
}
}
return createUnrecognizedEditPart(context, model);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java index 1441754b117..dab5005fa68 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java @@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.edit.policies; import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -33,6 +35,7 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;
import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE /**
* @generated
*/
+ private Set<EStructuralFeature> myFeaturesToSynchronize;
+
+ /**
+ * @generated
+ */
protected void refreshOnActivate() {
// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners
List<?> c = getHost().getChildren();
@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE }
/**
- * Gets the feature to synchronize.
- *
- * @return the feature to synchronize
* @generated
*/
- protected EStructuralFeature getFeatureToSynchronize() {
- return UMLPackage.eINSTANCE.getClass_NestedClassifier();
+ protected Set getFeaturesToSynchronize() {
+ if(myFeaturesToSynchronize == null) {
+ myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());
+ }
+ return myFeaturesToSynchronize;
}
/**
@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE * @generated
*/
private boolean isMyDiagramElement(View view) {
- return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+ int visualID = UMLVisualIDRegistry.getVisualID(view);
+ return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java index 5a3ba74d566..89de98ea1d6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java @@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.edit.policies; import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -33,6 +35,7 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;
import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica /**
* @generated
*/
+ private Set<EStructuralFeature> myFeaturesToSynchronize;
+
+ /**
+ * @generated
+ */
protected void refreshOnActivate() {
// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners
List<?> c = getHost().getChildren();
@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica }
/**
- * Gets the feature to synchronize.
- *
- * @return the feature to synchronize
* @generated
*/
- protected EStructuralFeature getFeatureToSynchronize() {
- return UMLPackage.eINSTANCE.getClass_NestedClassifier();
+ protected Set getFeaturesToSynchronize() {
+ if(myFeaturesToSynchronize == null) {
+ myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());
+ }
+ return myFeaturesToSynchronize;
}
/**
@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica * @generated
*/
private boolean isMyDiagramElement(View view) {
- return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+ int visualID = UMLVisualIDRegistry.getVisualID(view);
+ return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java index 2886b9eb53a..a1b3114be39 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java @@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.edit.policies; import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
@@ -33,6 +35,7 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;
import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic /**
* @generated
*/
+ private Set<EStructuralFeature> myFeaturesToSynchronize;
+
+ /**
+ * @generated
+ */
protected void refreshOnActivate() {
// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners
List<?> c = getHost().getChildren();
@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic }
/**
- * Gets the feature to synchronize.
- *
- * @return the feature to synchronize
* @generated
*/
- protected EStructuralFeature getFeatureToSynchronize() {
- return UMLPackage.eINSTANCE.getClass_NestedClassifier();
+ protected Set getFeaturesToSynchronize() {
+ if(myFeaturesToSynchronize == null) {
+ myFeaturesToSynchronize = new HashSet<EStructuralFeature>();
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());
+ myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());
+ }
+ return myFeaturesToSynchronize;
}
/**
@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic * @generated
*/
private boolean isMyDiagramElement(View view) {
- return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+ int visualID = UMLVisualIDRegistry.getVisualID(view);
+ return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java index f7dd5361c47..473de7eaf50 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java @@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;
import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
// TODO: Auto-generated Javadoc
@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicy extends UMLBase }
return getGEFWrapper(new ComponentCreateCommandCN(req));
}
+ if(UMLElementTypes.Property_3079 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new PropertyCreateCommand(req));
+ }
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java index 91cb2be43e3..be548445f52 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java @@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;
import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
// TODO: Auto-generated Javadoc
@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBa }
return getGEFWrapper(new ComponentCreateCommandCN(req));
}
+ if(UMLElementTypes.Property_3079 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new PropertyCreateCommand(req));
+ }
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java index 9511030f6d7..b205d5452e7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java @@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;
import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
// TODO: Auto-generated Javadoc
@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicyPCN extends UMLB }
return getGEFWrapper(new ComponentCreateCommandCN(req));
}
+ if(UMLElementTypes.Property_3079 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new PropertyCreateCommand(req));
+ }
return super.getCreateCommand(req);
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java new file mode 100644 index 00000000000..48c66a93686 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java @@ -0,0 +1,291 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.policies;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
+
+ /**
+ * @generated
+ */
+ public ConnectorItemSemanticEditPolicy() {
+ super(UMLElementTypes.Connector_4019);
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getDestroyElementCommand(DestroyElementRequest req) {
+ EObject selectedEObject = req.getElementToDestroy();
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
+ if(provider != null) {
+ // Retrieve delete command from the Element Edit service
+ ICommand deleteCommand = provider.getEditCommand(req);
+ if(deleteCommand != null) {
+ return new ICommandProxy(deleteCommand);
+ }
+ }
+ return UnexecutableCommand.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
+ Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
+ return command != null ? command : super.getCreateRelationshipCommand(req);
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
+ IElementType requestElementType = req.getElementType();
+ if(requestElementType == null) {
+ return null;
+ }
+ IElementType baseElementType = requestElementType;
+ boolean isExtendedType = false;
+ if(requestElementType instanceof IExtendedHintedElementType) {
+ baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
+ if(baseElementType != null) {
+ isExtendedType = true;
+ } else {
+ // no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
+ baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);
+ isExtendedType = true;
+ }
+ }
+ if(UMLElementTypes.Usage_4001 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Substitution_4012 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Manifestation_4014 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Abstraction_4013 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {
+ return null;
+ }
+ if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {
+ return null;
+ }
+ if(UMLElementTypes.Dependency_4010 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Dependency_4017 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new DependencyBranchCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
+ IElementType requestElementType = req.getElementType();
+ if(requestElementType == null) {
+ return null;
+ }
+ IElementType baseElementType = requestElementType;
+ boolean isExtendedType = false;
+ if(requestElementType instanceof IExtendedHintedElementType) {
+ baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
+ if(baseElementType != null) {
+ isExtendedType = true;
+ } else {
+ // no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
+ baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);
+ isExtendedType = true;
+ }
+ }
+ if(UMLElementTypes.Usage_4001 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {
+ return null;
+ }
+ if(UMLElementTypes.Substitution_4012 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Manifestation_4014 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Abstraction_4013 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Dependency_4010 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Dependency_4017 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new DependencyBranchCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ return null;
+ }
+
+ /**
+ * Returns command to reorient EClass based link. New link target or source
+ * should be the domain model element associated with this node.
+ *
+ * @generated
+ */
+ protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
+ switch(getVisualID(req)) {
+ case UsageEditPart.VISUAL_ID:
+ case InterfaceRealizationEditPart.VISUAL_ID:
+ case SubstitutionEditPart.VISUAL_ID:
+ case ManifestationEditPart.VISUAL_ID:
+ case ComponentRealizationEditPart.VISUAL_ID:
+ case AbstractionEditPart.VISUAL_ID:
+ case DependencyEditPart.VISUAL_ID:
+ case DependencyBranchEditPart.VISUAL_ID:
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
+ if(provider == null) {
+ return UnexecutableCommand.INSTANCE;
+ }
+ // Retrieve re-orient command from the Element Edit service
+ ICommand reorientCommand = provider.getEditCommand(req);
+ if(reorientCommand == null) {
+ return UnexecutableCommand.INSTANCE;
+ }
+ return getGEFWrapper(reorientCommand.reduce());
+ }
+ return super.getReorientRelationshipCommand(req);
+ }
+
+ /**
+ * Returns command to reorient EReference based link. New link target or source
+ * should be the domain model element associated with this node.
+ *
+ * @generated
+ */
+ protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
+ switch(getVisualID(req)) {
+ case CommentAnnotatedElementEditPart.VISUAL_ID:
+ return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
+ case ConstraintConstrainedElementEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ }
+ return super.getReorientReferenceRelationshipCommand(req);
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java index f4d1323fdf8..7e42a205919 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java @@ -287,8 +287,8 @@ public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemant }
/**
- * Returns command to reorient EReference based link. New link target or source
- * should be the domain model element associated with this node.
+ * Returns command to reorient EReference based link. New link target or
+ * source should be the domain model element associated with this node.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java index 75c2ca206d8..3789004a692 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java @@ -274,8 +274,8 @@ public class DependencyBranchItemSemanticEditPolicy extends UMLBaseItemSemanticE }
/**
- * Returns command to reorient EReference based link. New link target or source
- * should be the domain model element associated with this node.
+ * Returns command to reorient EReference based link. New link target or
+ * source should be the domain model element associated with this node.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java index 4d74aea4a5e..f31f5f28d36 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java @@ -274,8 +274,8 @@ public class DependencyNodeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi }
/**
- * Returns command to reorient EReference based link. New link target or source
- * should be the domain model element associated with this node.
+ * Returns command to reorient EReference based link. New link target or
+ * source should be the domain model element associated with this node.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java index caf0e0725f7..73138c5361a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.policies;
import java.util.ArrayList;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java index e09555e8baf..57a380c06e2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.policies;
import org.eclipse.gef.commands.Command;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java index aa071e45517..8120b78b1b0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.policies;
import java.util.ArrayList;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java index a16623330ab..30f55bc324c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java @@ -1,3 +1,6 @@ +/*
+ *
+ */
package org.eclipse.papyrus.uml.diagram.component.edit.policies;
import org.eclipse.gef.commands.Command;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java index a1bc003d38d..9a39f7c2f76 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java @@ -59,6 +59,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart; import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;
@@ -77,6 +78,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN; import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;
@@ -490,6 +492,14 @@ public class ModelCanonicalEditPolicy extends CanonicalEditPolicy { domain2NotationMap.putView(view.getElement(), view);
break;
}
+ case PropertyPartEditPartCN.VISUAL_ID:
+ {
+ if(!domain2NotationMap.containsKey(view.getElement())) {
+ result.addAll(UMLDiagramUpdater.getProperty_3079ContainedLinks(view));
+ }
+ domain2NotationMap.putView(view.getElement(), view);
+ break;
+ }
case UsageEditPart.VISUAL_ID:
{
if(!domain2NotationMap.containsKey(view.getElement())) {
@@ -562,6 +572,14 @@ public class ModelCanonicalEditPolicy extends CanonicalEditPolicy { domain2NotationMap.putView(view.getElement(), view);
break;
}
+ case ConnectorEditPart.VISUAL_ID:
+ {
+ if(!domain2NotationMap.containsKey(view.getElement())) {
+ result.addAll(UMLDiagramUpdater.getConnector_4019ContainedLinks(view));
+ }
+ domain2NotationMap.putView(view.getElement(), view);
+ break;
+ }
}
for(Iterator children = view.getChildren().iterator(); children.hasNext();) {
result.addAll(collectAllLinks((View)children.next(), domain2NotationMap));
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java index 06454c7c85f..36ec451cdd5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java @@ -627,8 +627,8 @@ public class ModelItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy { }
/**
- * Returns command to reorient EReference based link. New link target or source
- * should be the domain model element associated with this node.
+ * Returns command to reorient EReference based link. New link target or
+ * source should be the domain model element associated with this node.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java index e13399e3a33..3b4473b6949 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java @@ -627,8 +627,8 @@ public class ModelItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy }
/**
- * Returns command to reorient EReference based link. New link target or source
- * should be the domain model element associated with this node.
+ * Returns command to reorient EReference based link. New link target or
+ * source should be the domain model element associated with this node.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java index 37ccc4a7ccb..7f919994079 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java @@ -274,8 +274,8 @@ public class PackageItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli }
/**
- * Returns command to reorient EReference based link. New link target or source
- * should be the domain model element associated with this node.
+ * Returns command to reorient EReference based link. New link target or
+ * source should be the domain model element associated with this node.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java new file mode 100644 index 00000000000..fd5cce09029 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java @@ -0,0 +1,168 @@ +/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.policies;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class PropertyCanonicalEditPolicy extends CanonicalEditPolicy {
+
+ /**
+ * @generated
+ */
+ protected void refreshOnActivate() {
+ // Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners
+ List<?> c = getHost().getChildren();
+ for(int i = 0; i < c.size(); i++) {
+ ((EditPart)c.get(i)).activate();
+ }
+ super.refreshOnActivate();
+ }
+
+ /**
+ * @generated
+ */
+ protected EStructuralFeature getFeatureToSynchronize() {
+ return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();
+ }
+
+ /**
+ * @generated
+ */
+ @SuppressWarnings("rawtypes")
+ protected List getSemanticChildrenList() {
+ View viewObject = (View)getHost().getModel();
+ LinkedList<EObject> result = new LinkedList<EObject>();
+ List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getProperty_3079SemanticChildren(viewObject);
+ for(UMLNodeDescriptor d : childDescriptors) {
+ result.add(d.getModelElement());
+ }
+ return result;
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {
+ return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());
+ }
+
+ /**
+ * @generated
+ */
+ private boolean isMyDiagramElement(View view) {
+ return PortEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);
+ }
+
+ /**
+ * @generated
+ */
+ protected void refreshSemantic() {
+ if(resolveSemanticElement() == null) {
+ return;
+ }
+ LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();
+ List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getProperty_3079SemanticChildren((View)getHost().getModel());
+ LinkedList<View> orphaned = new LinkedList<View>();
+ // we care to check only views we recognize as ours
+ LinkedList<View> knownViewChildren = new LinkedList<View>();
+ for(View v : getViewChildren()) {
+ if(isMyDiagramElement(v)) {
+ knownViewChildren.add(v);
+ }
+ }
+ // alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)
+ //
+ // iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP
+ // iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one
+ // to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()
+ for(Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {
+ UMLNodeDescriptor next = descriptorsIterator.next();
+ String hint = UMLVisualIDRegistry.getType(next.getVisualID());
+ LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor
+ for(View childView : getViewChildren()) {
+ EObject semanticElement = childView.getElement();
+ if(next.getModelElement().equals(semanticElement)) {
+ if(hint.equals(childView.getType())) {
+ perfectMatch.add(childView);
+ // actually, can stop iteration over view children here, but
+ // may want to use not the first view but last one as a 'real' match (the way original CEP does
+ // with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren
+ }
+ }
+ }
+ if(perfectMatch.size() > 0) {
+ descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor
+ // use only one view (first or last?), keep rest as orphaned for further consideration
+ knownViewChildren.remove(perfectMatch.getFirst());
+ }
+ }
+ // those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,
+ // or those we have potential matches to, and thus need to be recreated, preserving size/location information.
+ orphaned.addAll(knownViewChildren);
+ //
+ ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());
+ for(UMLNodeDescriptor next : childDescriptors) {
+ String hint = UMLVisualIDRegistry.getType(next.getVisualID());
+ IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);
+ CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());
+ viewDescriptors.add(descriptor);
+ }
+ boolean changed = deleteViews(orphaned.iterator());
+ //
+ CreateViewRequest request = getCreateViewRequest(viewDescriptors);
+ Command cmd = getCreateViewCommand(request);
+ if(cmd != null && cmd.canExecute()) {
+ SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();
+ executeCommand(cmd);
+ @SuppressWarnings("unchecked")
+ List<IAdaptable> nl = (List<IAdaptable>)request.getNewObject();
+ createdViews.addAll(nl);
+ }
+ if(changed || createdViews.size() > 0) {
+ postProcessRefreshSemantic(createdViews);
+ }
+ if(createdViews.size() > 1) {
+ // perform a layout of the container
+ DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());
+ executeCommand(new ICommandProxy(layoutCmd));
+ }
+ makeViewsImmutable(createdViews);
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java new file mode 100644 index 00000000000..172f026e434 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java @@ -0,0 +1,401 @@ +/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST)- Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.edit.policies;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PortCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+
+/**
+ * @generated
+ */
+public class PropertyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
+
+ /**
+ * @generated
+ */
+ public PropertyItemSemanticEditPolicy() {
+ super(UMLElementTypes.Property_3079);
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getCreateCommand(CreateElementRequest req) {
+ IElementType requestElementType = req.getElementType();
+ if(requestElementType == null) {
+ return super.getCreateCommand(req);
+ }
+ IElementType baseElementType = requestElementType;
+ boolean isExtendedType = false;
+ if(requestElementType instanceof IExtendedHintedElementType) {
+ baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
+ if(baseElementType != null) {
+ isExtendedType = true;
+ } else {
+ // no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
+ baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);
+ isExtendedType = true;
+ }
+ }
+ if(UMLElementTypes.Port_3069 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new PortCreateCommand(req));
+ }
+ return super.getCreateCommand(req);
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getDestroyElementCommand(DestroyElementRequest req) {
+ View view = (View)getHost().getModel();
+ CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
+ cmd.setTransactionNestingEnabled(true);
+ EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
+ if(annotation == null) {
+ // there are indirectly referenced children, need extra commands: true
+ addDestroyChildNodesCommand(cmd);
+ addDestroyShortcutsCommand(cmd, view);
+ // delete host element
+ List<EObject> todestroy = new ArrayList<EObject>();
+ todestroy.add(req.getElementToDestroy());
+ //cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
+ cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));
+ } else {
+ cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));
+ }
+ return getGEFWrapper(cmd.reduce());
+ }
+
+ /**
+ * @generated
+ */
+ protected void addDestroyChildNodesCommand(ICompositeCommand cmd) {
+ View view = (View)getHost().getModel();
+ for(Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {
+ Node node = (Node)nit.next();
+ switch(UMLVisualIDRegistry.getVisualID(node)) {
+ case PortEditPart.VISUAL_ID:
+ for(Iterator<?> it = node.getTargetEdges().iterator(); it.hasNext();) {
+ Edge incomingLink = (Edge)it.next();
+ switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {
+ case CommentAnnotatedElementEditPart.VISUAL_ID:
+ case ConstraintConstrainedElementEditPart.VISUAL_ID:
+ DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);
+ cmd.add(new DestroyReferenceCommand(destroyRefReq));
+ cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));
+ break;
+ case UsageEditPart.VISUAL_ID:
+ case SubstitutionEditPart.VISUAL_ID:
+ case ManifestationEditPart.VISUAL_ID:
+ case ComponentRealizationEditPart.VISUAL_ID:
+ case AbstractionEditPart.VISUAL_ID:
+ case DependencyEditPart.VISUAL_ID:
+ case DependencyBranchEditPart.VISUAL_ID:
+ DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);
+ cmd.add(new DestroyElementCommand(destroyEltReq));
+ cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));
+ break;
+ }
+ }
+ for(Iterator<?> it = node.getSourceEdges().iterator(); it.hasNext();) {
+ Edge outgoingLink = (Edge)it.next();
+ switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {
+ case UsageEditPart.VISUAL_ID:
+ case InterfaceRealizationEditPart.VISUAL_ID:
+ case SubstitutionEditPart.VISUAL_ID:
+ case ManifestationEditPart.VISUAL_ID:
+ case ComponentRealizationEditPart.VISUAL_ID:
+ case AbstractionEditPart.VISUAL_ID:
+ case DependencyEditPart.VISUAL_ID:
+ case DependencyBranchEditPart.VISUAL_ID:
+ DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);
+ cmd.add(new DestroyElementCommand(destroyEltReq));
+ cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));
+ break;
+ }
+ }
+ cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), node.getElement(), false))); // directlyOwned: false
+ // don't need explicit deletion of node as parent's view deletion would clean child views as well
+ // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));
+ break;
+ }
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
+ Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
+ return command != null ? command : super.getCreateRelationshipCommand(req);
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
+ IElementType requestElementType = req.getElementType();
+ if(requestElementType == null) {
+ return null;
+ }
+ IElementType baseElementType = requestElementType;
+ boolean isExtendedType = false;
+ if(requestElementType instanceof IExtendedHintedElementType) {
+ baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
+ if(baseElementType != null) {
+ isExtendedType = true;
+ } else {
+ // no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
+ baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);
+ isExtendedType = true;
+ }
+ }
+ if(UMLElementTypes.Usage_4001 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Substitution_4012 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Manifestation_4014 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Abstraction_4013 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {
+ return null;
+ }
+ if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {
+ return null;
+ }
+ if(UMLElementTypes.Dependency_4010 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Dependency_4017 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new DependencyBranchCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
+ IElementType requestElementType = req.getElementType();
+ if(requestElementType == null) {
+ return null;
+ }
+ IElementType baseElementType = requestElementType;
+ boolean isExtendedType = false;
+ if(requestElementType instanceof IExtendedHintedElementType) {
+ baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
+ if(baseElementType != null) {
+ isExtendedType = true;
+ } else {
+ // no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
+ baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);
+ isExtendedType = true;
+ }
+ }
+ if(UMLElementTypes.Usage_4001 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {
+ return null;
+ }
+ if(UMLElementTypes.Substitution_4012 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Manifestation_4014 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Abstraction_4013 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Dependency_4010 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ if(UMLElementTypes.Dependency_4017 == baseElementType) {
+ if(isExtendedType) {
+ return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);
+ }
+ return getGEFWrapper(new DependencyBranchCreateCommand(req, req.getSource(), req.getTarget()));
+ }
+ return null;
+ }
+
+ /**
+ * Returns command to reorient EClass based link. New link target or source
+ * should be the domain model element associated with this node.
+ *
+ * @generated
+ */
+ protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
+ switch(getVisualID(req)) {
+ case UsageEditPart.VISUAL_ID:
+ case InterfaceRealizationEditPart.VISUAL_ID:
+ case SubstitutionEditPart.VISUAL_ID:
+ case ManifestationEditPart.VISUAL_ID:
+ case ComponentRealizationEditPart.VISUAL_ID:
+ case AbstractionEditPart.VISUAL_ID:
+ case DependencyEditPart.VISUAL_ID:
+ case DependencyBranchEditPart.VISUAL_ID:
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
+ if(provider == null) {
+ return UnexecutableCommand.INSTANCE;
+ }
+ // Retrieve re-orient command from the Element Edit service
+ ICommand reorientCommand = provider.getEditCommand(req);
+ if(reorientCommand == null) {
+ return UnexecutableCommand.INSTANCE;
+ }
+ return getGEFWrapper(reorientCommand.reduce());
+ }
+ return super.getReorientRelationshipCommand(req);
+ }
+
+ /**
+ * Returns command to reorient EReference based link. New link target or
+ * source should be the domain model element associated with this node.
+ *
+ * @generated
+ */
+ protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
+ switch(getVisualID(req)) {
+ case CommentAnnotatedElementEditPart.VISUAL_ID:
+ return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
+ case ConstraintConstrainedElementEditPart.VISUAL_ID:
+ return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
+ }
+ return super.getReorientReferenceRelationshipCommand(req);
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java index 22ac18ffcf9..ef4527b1f92 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java @@ -357,8 +357,8 @@ public class RectangleInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanti }
/**
- * Returns command to reorient EReference based link. New link target or source
- * should be the domain model element associated with this node.
+ * Returns command to reorient EReference based link. New link target or
+ * source should be the domain model element associated with this node.
*
* @generated
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java index b9c150d1168..6ccb7b8c931 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java @@ -59,6 +59,8 @@ import org.eclipse.uml2.uml.Abstraction; import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.ComponentRealization;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
import org.eclipse.uml2.uml.Constraint;
import org.eclipse.uml2.uml.Dependency;
import org.eclipse.uml2.uml.Element;
@@ -68,6 +70,7 @@ import org.eclipse.uml2.uml.InterfaceRealization; import org.eclipse.uml2.uml.Manifestation;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.StructuredClassifier;
import org.eclipse.uml2.uml.Substitution;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.Usage;
@@ -717,6 +720,13 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { }
/**
+ * @generated
+ */
+ public boolean canCreateConnector_4019(StructuredClassifier container, ConnectorEnd source, ConnectorEnd target) {
+ return canExistConnector_4019(container, null, source, target);
+ }
+
+ /**
* Can exist usage_4001.
*
* @param container
@@ -957,5 +967,12 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { public boolean canExistLink_4018() {
return true;
}
+
+ /**
+ * @generated
+ */
+ public boolean canExistConnector_4019(StructuredClassifier container, Connector linkInstance, ConnectorEnd source, ConnectorEnd target) {
+ return true;
+ }
}
}
|