diff options
author | Mickael ADAM | 2014-09-09 15:00:59 +0000 |
---|---|---|
committer | Mickael ADAM | 2014-09-23 12:06:57 +0000 |
commit | 3d8a37d4c55ba794588e8f17d5abc89aa9a8fcb4 (patch) | |
tree | 6072e6f533d7c79e7cde62a70c1cd5a1fef6445b /plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common | |
parent | 802249ab83497e7e4f8b472a89c92b3486db874b (diff) | |
download | org.eclipse.papyrus-3d8a37d4c55ba794588e8f17d5abc89aa9a8fcb4.tar.gz org.eclipse.papyrus-3d8a37d4c55ba794588e8f17d5abc89aa9a8fcb4.tar.xz org.eclipse.papyrus-3d8a37d4c55ba794588e8f17d5abc89aa9a8fcb4.zip |
440226: [All Diagrams] Allow Left side label edition (not only right
side )
https://bugs.eclipse.org/bugs/show_bug.cgi?id=440226
Patch Set 1:
-Squach Previous commit
Description of previous Patch Set:
Patch set 1
- Applied new locator to Port of component diagram
- add method to notationUtils to getIntValue etc..
Patch Set 3:
-Implementation of text alignment for PortNameEP and
PapyrusLabelEP(Label from connection)
-Add button/command to set alignement
-Fix custumStyleValueCommand
Patch Set 4:
-Implementation for SysML
-Use of PapyrusEditPart for PortEditPart
-Some Fix
-TODO use generation to chance override of the portEditPart(xtend
already change, but code not generated). This must be do for each
diagram. It will be do on an other commit.
Patch Set 2:
-fix on xtend
Patch set 3 et 4 et 5:
-fix conflict resolved error
Change-Id: Ie0699d213abd4a7c39f8cff457c7dfe27a41eba3
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Diffstat (limited to 'plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common')
5 files changed, 77 insertions, 143 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF index 7c4fea7dfd5..96522b45f13 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF @@ -1,76 +1,77 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands,
- org.eclipse.papyrus.gmf.diagram.common.compatibility,
- org.eclipse.papyrus.gmf.diagram.common.edit.part,
- org.eclipse.papyrus.gmf.diagram.common.edit.policy,
- org.eclipse.papyrus.gmf.diagram.common.factory,
- org.eclipse.papyrus.gmf.diagram.common.locator,
- org.eclipse.papyrus.gmf.diagram.common.parser,
- org.eclipse.papyrus.gmf.diagram.common.provider,
- org.eclipse.papyrus.sysml.diagram.common,
- org.eclipse.papyrus.sysml.diagram.common.commands,
- org.eclipse.papyrus.sysml.diagram.common.dialogs,
- org.eclipse.papyrus.sysml.diagram.common.edit.part,
- org.eclipse.papyrus.sysml.diagram.common.edit.policy,
- org.eclipse.papyrus.sysml.diagram.common.factory,
- org.eclipse.papyrus.sysml.diagram.common.figure,
- org.eclipse.papyrus.sysml.diagram.common.messages,
- org.eclipse.papyrus.sysml.diagram.common.parser,
- org.eclipse.papyrus.sysml.diagram.common.preferences,
- org.eclipse.papyrus.sysml.diagram.common.strategy.paste,
- org.eclipse.papyrus.sysml.diagram.common.utils,
- org.eclipse.papyrus.uml.diagram.common.dnd.helper,
- org.eclipse.papyrus.uml.diagram.common.edit.part,
- org.eclipse.papyrus.uml.diagram.common.edit.policy,
- org.eclipse.papyrus.uml.diagram.common.factory,
- org.eclipse.papyrus.uml.diagram.common.figure,
- org.eclipse.papyrus.uml.diagram.common.parser,
- org.eclipse.papyrus.uml.diagram.common.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.sysml;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.1",
- org.eclipse.draw2d;bundle-version="3.7.1",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.uml2.common.edit;bundle-version="1.6.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",
- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleto
- n:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands, + org.eclipse.papyrus.gmf.diagram.common.compatibility, + org.eclipse.papyrus.gmf.diagram.common.edit.part, + org.eclipse.papyrus.gmf.diagram.common.edit.policy, + org.eclipse.papyrus.gmf.diagram.common.factory, + org.eclipse.papyrus.gmf.diagram.common.locator, + org.eclipse.papyrus.gmf.diagram.common.parser, + org.eclipse.papyrus.gmf.diagram.common.provider, + org.eclipse.papyrus.sysml.diagram.common, + org.eclipse.papyrus.sysml.diagram.common.commands, + org.eclipse.papyrus.sysml.diagram.common.dialogs, + org.eclipse.papyrus.sysml.diagram.common.edit.part, + org.eclipse.papyrus.sysml.diagram.common.edit.policy, + org.eclipse.papyrus.sysml.diagram.common.factory, + org.eclipse.papyrus.sysml.diagram.common.figure, + org.eclipse.papyrus.sysml.diagram.common.messages, + org.eclipse.papyrus.sysml.diagram.common.parser, + org.eclipse.papyrus.sysml.diagram.common.preferences, + org.eclipse.papyrus.sysml.diagram.common.strategy.paste, + org.eclipse.papyrus.sysml.diagram.common.utils, + org.eclipse.papyrus.uml.diagram.common.dnd.helper, + org.eclipse.papyrus.uml.diagram.common.edit.part, + org.eclipse.papyrus.uml.diagram.common.edit.policy, + org.eclipse.papyrus.uml.diagram.common.factory, + org.eclipse.papyrus.uml.diagram.common.figure, + org.eclipse.papyrus.uml.diagram.common.parser, + org.eclipse.papyrus.uml.diagram.common.utils +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.infra.core;bundle-version="1.0.1", + org.eclipse.emf;bundle-version="2.6.0", + org.eclipse.uml2.uml;bundle-version="3.1.0", + org.eclipse.papyrus.sysml;bundle-version="1.0.1", + org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1", + org.eclipse.core.expressions, + org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1", + org.eclipse.papyrus.editor;bundle-version="1.0.1", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.1", + org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.1", + org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1", + org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1", + org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.1", + org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1", + org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.1", + org.eclipse.draw2d;bundle-version="3.7.1", + org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", + org.eclipse.papyrus.uml.tools;bundle-version="1.0.1", + org.eclipse.papyrus.infra.emf;bundle-version="1.0.1", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1", + org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1", + org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1", + org.eclipse.uml2.common.edit;bundle-version="1.6.0", + org.eclipse.uml2.uml.edit;bundle-version="4.0.0", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1", + org.eclipse.emf.edit.ui;bundle-version="2.8.0", + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1", + org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0", + org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1", + org.eclipse.papyrus.infra.tools;bundle-version="1.0.1", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1", + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1", + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1", + org.eclipse.core.databinding.observable +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.0.1.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleto + n:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java index 86c880a3125..e2f0b91bdbf 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java @@ -16,11 +16,9 @@ package org.eclipse.papyrus.sysml.diagram.common.edit.part; import java.util.List; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart; import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator; -import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper; @@ -63,20 +61,6 @@ public class FlowPortAffixedLabelNameEditPart extends AbstractElementLabelEditPa return null; } - @Override - public void refreshBounds() { - int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); - int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); - - // Update locator constraint - IBorderItemLocator locator = getBorderItemLocator(); - locator.setConstraint(new Rectangle(x, y, width, height)); - - // Set new constraint on parent figure - getFigure().getParent().setConstraint(getFigure(), locator); - } /** * {@inheritDoc} diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java index bd83628ec6c..8d037e64241 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java @@ -14,11 +14,9 @@ package org.eclipse.papyrus.uml.diagram.common.edit.part; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions; import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart; import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator; -import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy; @@ -56,21 +54,6 @@ public class AppliedStereotypeAffixedLabelEditPart extends AbstractElementLabelE return null; } - @Override - public void refreshBounds() { - int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); - int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); - - // Update locator constraint - IBorderItemLocator locator = getBorderItemLocator(); - locator.setConstraint(new Rectangle(x, y, width, height)); - - // Set new constraint on parent figure - getFigure().getParent().setConstraint(getFigure(), locator); - } - /** * {@inheritDoc} */ diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java index e14cca2100e..be434b24f66 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java @@ -16,11 +16,9 @@ package org.eclipse.papyrus.uml.diagram.common.edit.part; import java.util.List; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart; import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator; -import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper; import org.eclipse.papyrus.sysml.diagram.common.Activator; @@ -59,21 +57,6 @@ public class NamedElementAffixedLabelNameEditPart extends AbstractElementLabelEd return null; } - @Override - public void refreshBounds() { - int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); - int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); - - // Update locator constraint - IBorderItemLocator locator = getBorderItemLocator(); - locator.setConstraint(new Rectangle(x, y, width, height)); - - // Set new constraint on parent figure - getFigure().getParent().setConstraint(getFigure(), locator); - } - /** * {@inheritDoc} */ diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java index 0897b90b6c5..73576ba8c9a 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java @@ -16,11 +16,9 @@ package org.eclipse.papyrus.uml.diagram.common.edit.part; import java.util.List; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart; import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator; -import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper; import org.eclipse.papyrus.sysml.diagram.common.Activator; @@ -57,21 +55,6 @@ public class PortAffixedLabelNameEditPart extends AbstractElementLabelEditPart i return null; } - @Override - public void refreshBounds() { - int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); - int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); - - // Update locator constraint - IBorderItemLocator locator = getBorderItemLocator(); - locator.setConstraint(new Rectangle(x, y, width, height)); - - // Set new constraint on parent figure - getFigure().getParent().setConstraint(getFigure(), locator); - } - /** * {@inheritDoc} */ |