summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael ADAM2014-03-03 10:53:46 (EST)
committerCamille Letavernier2014-03-26 08:44:07 (EDT)
commit74b466b6c3a7a11c480a6980b6aabd7fc83c2bac (patch)
tree8d240b0eb6a6f39a84daac34155b9b643c0b0579
parent2b3f51cae70a5a5718295cbe5163fcae9fcc16fd (diff)
downloadorg.eclipse.papyrus-74b466b6c3a7a11c480a6980b6aabd7fc83c2bac.zip
org.eclipse.papyrus-74b466b6c3a7a11c480a6980b6aabd7fc83c2bac.tar.gz
org.eclipse.papyrus-74b466b6c3a7a11c480a6980b6aabd7fc83c2bac.tar.bz2
429439: [Class diagram] Link Contaiment graphical representation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=429439 -Replace default implementation of NodePlate by Ellipse -Use Ellipse form implementation from common found in component Signed-off-by: Mickael ADAM <Mickael.ADAM@ALL4TEC.net>
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CContainmentCircleEditPart.java5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/EllipseFigure.java (renamed from plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/EllipseFigure.java)2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java2
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CContainmentCircleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CContainmentCircleEditPart.java
index d8bda01..0dcf0c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CContainmentCircleEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CContainmentCircleEditPart.java
@@ -8,13 +8,14 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- *
+ * MickaŽl Adam (ALL4TEC) mickael.adam@all4tec.net
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentCircleEditPart;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.EllipseFigure;
public class CContainmentCircleEditPart extends ContainmentCircleEditPart {
@@ -38,7 +39,7 @@ public class CContainmentCircleEditPart extends ContainmentCircleEditPart {
* Modify the default size of the containment circle node
*/
protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {
- org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure result = new org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure(20, 20);
+ org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure result = new EllipseFigure(20, 20);
// FIXME: workaround for #154536
result.getBounds().setSize(result.getPreferredSize());
return result;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/EllipseFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/EllipseFigure.java
index 85f2b5e..8d71d5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/EllipseFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/EllipseFigure.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes;
+package org.eclipse.papyrus.uml.diagram.common.figure.node;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
index 1ec659e..41f0d66 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.EllipseFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.EllipseFigure;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfacePortLinkEditPart;
import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;