Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2012-02-17 10:27:31 -0500
committercletavernie2012-02-17 10:27:31 -0500
commit6706fb7cd1f11ae40a1e866dad9dd3493fc9e95f (patch)
treee9bcfe1a54e8039026b5a3f0dc9c96a1114bfd44 /plugins
parentd73cd10c953690607c1294b3c683a1484c2a6be7 (diff)
downloadorg.eclipse.papyrus-6706fb7cd1f11ae40a1e866dad9dd3493fc9e95f.tar.gz
org.eclipse.papyrus-6706fb7cd1f11ae40a1e866dad9dd3493fc9e95f.tar.xz
org.eclipse.papyrus-6706fb7cd1f11ae40a1e866dad9dd3493fc9e95f.zip
371460: [UML Diagram Common] The UML Diagram Common plug-in should be split
https://bugs.eclipse.org/bugs/show_bug.cgi?id=371460
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath1
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ArrowStyleProvider.java23
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ByteArrayValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/CanonicalStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ConnectorStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DataTypeStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DescriptionStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramLinkStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DrawerStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectListValueStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectValueStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FillStyleProvider.java25
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FilteringStyleProvider.java23
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FontStyleProvider.java37
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/GuideStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/HintedDiagramLinkStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageBufferStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageStyleProvider.java22
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineStyleProvider.java22
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineTypeStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/MultiDiagramLinkStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/NamedStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PageStyleProvider.java28
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PropertiesSetStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoundedCornersStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoutingStyleProvider.java41
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ShapeStyleProvider.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SingleValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SortingStyleProvider.java23
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringListValueStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringValueStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TextStyleProvider.java20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TitleStyleProvider.java19
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java49
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IStylableEditPart.java17
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java146
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java65
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java65
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java57
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/AbstractStyleEditPolicy.java53
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/StyleEditPolicy.java23
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java10
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractCommentEditPart.java22
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractConstraintEditPart.java15
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractLabelEditPart.java6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AppliedStereotypePropertyEditPart.java126
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java24
58 files changed, 151 insertions, 1366 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
index ed2585fb3f4..2d1a4302f04 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 7c93c8a1520..999ddd74d67 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,
org.eclipse.papyrus.infra.gmfdiag.common.figure.node,
org.eclipse.papyrus.infra.gmfdiag.common.handler,
- org.eclipse.papyrus.infra.gmfdiag.common.helper,
- org.eclipse.papyrus.infra.gmfdiag.common.notation
+ org.eclipse.papyrus.infra.gmfdiag.common.helper
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Name: %pluginName
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ArrowStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ArrowStyleProvider.java
deleted file mode 100644
index b0f683bd9c5..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ArrowStyleProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.gmf.runtime.notation.ArrowType;
-
-public interface ArrowStyleProvider {
-
- public ArrowType getArrowSource();
-
-
- public ArrowType getArrowTarget();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanListValueStyleProvider.java
deleted file mode 100644
index c0cf5524060..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanListValueStyleProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.emf.common.util.EList;
-
-public interface BooleanListValueStyleProvider extends NamedStyleProvider{
-
- public EList getBooleanListValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanValueStyleProvider.java
deleted file mode 100644
index 802d60e4bcc..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/BooleanValueStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface BooleanValueStyleProvider extends NamedStyleProvider{
-
- public boolean isBooleanValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ByteArrayValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ByteArrayValueStyleProvider.java
deleted file mode 100644
index cf40c759b1c..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ByteArrayValueStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface ByteArrayValueStyleProvider extends NamedStyleProvider{
-
- public byte[] getByteArrayValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/CanonicalStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/CanonicalStyleProvider.java
deleted file mode 100644
index 40aee741e13..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/CanonicalStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface CanonicalStyleProvider {
-
- public boolean isCanonical();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ConnectorStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ConnectorStyleProvider.java
deleted file mode 100644
index 4461ce15447..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ConnectorStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface ConnectorStyleProvider extends RoundedCornersStyleProvider, RoutingStyleProvider, LineStyleProvider{
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DataTypeStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DataTypeStyleProvider.java
deleted file mode 100644
index 1e973726da7..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DataTypeStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface DataTypeStyleProvider extends NamedStyleProvider{
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DescriptionStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DescriptionStyleProvider.java
deleted file mode 100644
index 7b332c37eff..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DescriptionStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface DescriptionStyleProvider {
-
- public java.lang.String getDescription();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramLinkStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramLinkStyleProvider.java
deleted file mode 100644
index b0e37c20096..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramLinkStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface DiagramLinkStyleProvider {
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramStyleProvider.java
deleted file mode 100644
index 869a7c8d843..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DiagramStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface DiagramStyleProvider extends PageStyleProvider, GuideStyleProvider, DescriptionStyleProvider{
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleListValueStyleProvider.java
deleted file mode 100644
index 17397e58a4d..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleListValueStyleProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.emf.common.util.EList;
-
-public interface DoubleListValueStyleProvider extends NamedStyleProvider{
-
- public EList getDoubleListValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleValueStyleProvider.java
deleted file mode 100644
index da74f416ece..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DoubleValueStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface DoubleValueStyleProvider extends NamedStyleProvider{
-
- public double getDoubleValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DrawerStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DrawerStyleProvider.java
deleted file mode 100644
index b6444f80ac4..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/DrawerStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface DrawerStyleProvider {
-
- public boolean isCollapsed();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectListValueStyleProvider.java
deleted file mode 100644
index 8a9e05cb809..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectListValueStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface EObjectListValueStyleProvider extends NamedStyleProvider{
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectValueStyleProvider.java
deleted file mode 100644
index 1d8defa095d..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/EObjectValueStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface EObjectValueStyleProvider extends NamedStyleProvider{
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FillStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FillStyleProvider.java
deleted file mode 100644
index 243068920e9..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FillStyleProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface FillStyleProvider {
-
- public int getFillColor();
-
-
- public int getTransparency();
-
-
- public org.eclipse.gmf.runtime.notation.datatype.GradientData getGradient();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FilteringStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FilteringStyleProvider.java
deleted file mode 100644
index 04f900e727d..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FilteringStyleProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.gmf.runtime.notation.Filtering;
-
-public interface FilteringStyleProvider {
-
- public Filtering getFiltering();
-
-
- public java.util.List getFilteringKeys();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FontStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FontStyleProvider.java
deleted file mode 100644
index 3048772bcd6..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/FontStyleProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface FontStyleProvider {
-
- public int getFontColor();
-
-
- public java.lang.String getFontName();
-
-
- public int getFontHeight();
-
-
- public boolean isBold();
-
-
- public boolean isItalic();
-
-
- public boolean isUnderline();
-
-
- public boolean isStrikeThrough();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/GuideStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/GuideStyleProvider.java
deleted file mode 100644
index f3b1325d108..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/GuideStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface GuideStyleProvider {
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/HintedDiagramLinkStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/HintedDiagramLinkStyleProvider.java
deleted file mode 100644
index 813fb21f73e..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/HintedDiagramLinkStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface HintedDiagramLinkStyleProvider extends DiagramLinkStyleProvider{
-
- public java.lang.String getHint();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageBufferStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageBufferStyleProvider.java
deleted file mode 100644
index 640f2bb8c51..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageBufferStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface ImageBufferStyleProvider extends ImageStyleProvider{
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageStyleProvider.java
deleted file mode 100644
index 3c349965fa8..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ImageStyleProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface ImageStyleProvider {
-
- public java.lang.Boolean getAntiAlias();
-
-
- public java.lang.Boolean getMaintainAspectRatio();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntListValueStyleProvider.java
deleted file mode 100644
index 69686c6b805..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntListValueStyleProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.emf.common.util.EList;
-
-public interface IntListValueStyleProvider extends NamedStyleProvider{
-
- public EList getIntListValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntValueStyleProvider.java
deleted file mode 100644
index b9ff77f9e6c..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/IntValueStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface IntValueStyleProvider extends NamedStyleProvider{
-
- public int getIntValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineStyleProvider.java
deleted file mode 100644
index dc90b26c9d8..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineStyleProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface LineStyleProvider {
-
- public int getLineColor();
-
-
- public int getLineWidth();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineTypeStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineTypeStyleProvider.java
deleted file mode 100644
index 3a8e0253df4..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/LineTypeStyleProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.gmf.runtime.notation.LineType;
-
-public interface LineTypeStyleProvider {
-
- public LineType getLineType();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ListValueStyleProvider.java
deleted file mode 100644
index f1766447f1b..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ListValueStyleProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.emf.common.util.EList;
-
-public interface ListValueStyleProvider extends NamedStyleProvider, DataTypeStyleProvider{
-
- public EList getRawValuesList();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/MultiDiagramLinkStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/MultiDiagramLinkStyleProvider.java
deleted file mode 100644
index 3acd78834d2..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/MultiDiagramLinkStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface MultiDiagramLinkStyleProvider {
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/NamedStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/NamedStyleProvider.java
deleted file mode 100644
index 51f4b234a68..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/NamedStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface NamedStyleProvider {
-
- public java.lang.String getName();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PageStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PageStyleProvider.java
deleted file mode 100644
index f891c3f15d4..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PageStyleProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface PageStyleProvider {
-
- public int getPageX();
-
-
- public int getPageY();
-
-
- public int getPageWidth();
-
-
- public int getPageHeight();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PropertiesSetStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PropertiesSetStyleProvider.java
deleted file mode 100644
index a2043690225..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/PropertiesSetStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface PropertiesSetStyleProvider extends NamedStyleProvider{
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoundedCornersStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoundedCornersStyleProvider.java
deleted file mode 100644
index 9f228e3ca79..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoundedCornersStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface RoundedCornersStyleProvider {
-
- public int getRoundedBendpointsRadius();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoutingStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoutingStyleProvider.java
deleted file mode 100644
index 718d0117785..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/RoutingStyleProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-
-public interface RoutingStyleProvider extends RoundedCornersStyleProvider{
-
- public Routing getRouting();
-
-
- public Smoothness getSmoothness();
-
-
- public boolean isAvoidObstructions();
-
-
- public boolean isClosestDistance();
-
-
- public JumpLinkStatus getJumpLinkStatus();
-
-
- public JumpLinkType getJumpLinkType();
-
-
- public boolean isJumpLinksReverse();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ShapeStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ShapeStyleProvider.java
deleted file mode 100644
index db756ae4fe1..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/ShapeStyleProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface ShapeStyleProvider extends FontStyleProvider, DescriptionStyleProvider, FillStyleProvider, LineStyleProvider, RoundedCornersStyleProvider{
-
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SingleValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SingleValueStyleProvider.java
deleted file mode 100644
index dbbca0423ff..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SingleValueStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface SingleValueStyleProvider extends NamedStyleProvider, DataTypeStyleProvider{
-
- public java.lang.String getRawValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SortingStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SortingStyleProvider.java
deleted file mode 100644
index da1dbc4a264..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/SortingStyleProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.gmf.runtime.notation.Sorting;
-
-public interface SortingStyleProvider {
-
- public Sorting getSorting();
-
-
- public java.util.Map getSortingKeys();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringListValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringListValueStyleProvider.java
deleted file mode 100644
index bfefcdb2d4f..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringListValueStyleProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.emf.common.util.EList;
-
-public interface StringListValueStyleProvider extends NamedStyleProvider{
-
- public EList getStringListValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringValueStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringValueStyleProvider.java
deleted file mode 100644
index 09d85ece79f..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/StringValueStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface StringValueStyleProvider extends NamedStyleProvider{
-
- public java.lang.String getStringValue();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TextStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TextStyleProvider.java
deleted file mode 100644
index 21c8edf8662..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TextStyleProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-import org.eclipse.gmf.runtime.notation.TextAlignment;
-
-public interface TextStyleProvider {
-
- public TextAlignment getTextAlignment();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TitleStyleProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TitleStyleProvider.java
deleted file mode 100644
index 3762618617a..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src-gen/org/eclipse/papyrus/infra/gmfdiag/common/notation/TitleStyleProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.notation;
-
-
-public interface TitleStyleProvider {
-
- public boolean isShowTitle();
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
index b9e0a32cfe2..3c825d1c5a6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
@@ -11,62 +11,17 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.notation.LineStyleProvider;
/**
- * Abstract edit part for all connection nodes. CSS Ready.
+ * Abstract edit part for all connection nodes.
*/
-//TODO : Intercept the GMF Styles and retrieve the values from the CSS Engine
-//TODO: Move this EditPart to infra.gmfdiag.common
-public abstract class ConnectionEditPart extends ConnectionNodeEditPart implements IPapyrusEditPart, IStylableEditPart {
+public abstract class ConnectionEditPart extends ConnectionNodeEditPart implements IPapyrusEditPart {
public ConnectionEditPart(View view) {
super(view);
- //TODO: Implement refresh* to use the StyleEditPolicy
}
-
- //Styles implementation
-
- // refreshVisibility();
- // refreshRoutingStyles();
- // refreshSmoothness();
- // refreshRoundedBendpoints();
- // refreshJumplinks();
- // refreshBendpoints();
- // refreshFont();
-
- @Override
- protected final void refreshForegroundColor() {
- LineStyleProvider provider = (LineStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getLineStyle());
- if(provider == null) {
- super.refreshForegroundColor();
- return;
- }
- setForegroundColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getLineColor())));
- }
-
- /**
- * Returns the StyleProvider for the given Style EClass
- * May be null if a StyleEditPolicy is not defined.
- *
- * @param styleClass
- * @return
- */
- protected Object getStyleProvider(EClass styleClass) {
- Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
- if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
- return null;
- }
-
- Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
- return styleProvider;
- }
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IStylableEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IStylableEditPart.java
deleted file mode 100644
index 90d2f4fc844..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IStylableEditPart.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
-
-
-public interface IStylableEditPart {
-
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java
index a744c4bc197..7b1035bae76 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java
@@ -15,32 +15,20 @@
package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
import org.eclipse.gmf.runtime.notation.FillStyle;
-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.runtime.notation.datatype.GradientData;
import org.eclipse.papyrus.infra.emf.appearance.helper.ShadowFigureHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.notation.FillStyleProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.notation.FontStyleProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.notation.LineStyleProvider;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
/**
* this uml edit part can refresh shadow and gradient.
*/
-//TODO: Move this EditPart to infra.gmfdiag.common
-//TODO: Move IPapyrusNodeFigure to infra.gmfdiag.common
-//TODO: Move ShadowFigureHelper to infra.gmfdiag.common
-public abstract class NodeEditPart extends AbstractBorderedShapeEditPart implements IPapyrusEditPart, IStylableEditPart {
+public abstract class NodeEditPart extends AbstractBorderedShapeEditPart implements IPapyrusEditPart {
public NodeEditPart(View view) {
super(view);
@@ -97,8 +85,11 @@ public abstract class NodeEditPart extends AbstractBorderedShapeEditPart impleme
}
@Override
- public void activate() {
- super.activate();
+ protected void refreshVisuals() {
+ super.refreshVisuals();
+ refreshShadow();
+ refreshLineType();
+ refreshLineWidth();
}
@Override
@@ -141,9 +132,10 @@ public abstract class NodeEditPart extends AbstractBorderedShapeEditPart impleme
@Override
protected void setGradient(GradientData gradient) {
IPapyrusNodeFigure fig = getPrimaryShape();
+ FillStyle style = (FillStyle)getPrimaryView().getStyle(NotationPackage.Literals.FILL_STYLE);
if(gradient != null) {
- fig.setIsUsingGradient(true);
- fig.setGradientData(getFillColor(), gradient.getGradientColor1(), gradient.getGradientStyle());
+ fig.setIsUsingGradient(true);;
+ fig.setGradientData(style.getFillColor(), gradient.getGradientColor1(), gradient.getGradientStyle());
} else {
fig.setIsUsingGradient(false);
}
@@ -171,130 +163,10 @@ public abstract class NodeEditPart extends AbstractBorderedShapeEditPart impleme
getPrimaryShape().setForegroundColor(color);
}
- @Override
- protected void refreshVisuals() {
- super.refreshVisuals();
- refreshShadow();
- refreshLineType();
- refreshLineWidth();
- refreshFontColor();
- }
-
- //Style Implementation
-
- @Override
- protected final void refreshBackgroundColor() {
- if(supportsGradient()) {
- GradientData gradient = getGradient();
- if(gradient != null) {
- setGradient(gradient);
- return;
- }
- }
-
- setBackgroundColor(DiagramColorRegistry.getInstance().getColor(getFillColor()));
- }
-
- protected int getFillColor() {
- FillStyleProvider provider = (FillStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFillStyle());
- if(provider == null) {
- return ((FillStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFillStyle())).getFillColor();
- }
- return provider.getFillColor();
- }
-
- protected GradientData getGradient() {
- FillStyleProvider provider = (FillStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFillStyle());
- if(provider == null) {
- return ((FillStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFillStyle())).getGradient();
- }
- return provider.getGradient();
- }
-
/**
* Refresh the shadow of the figure
*/
protected final void refreshShadow() {
getPrimaryShape().setShadow(ShadowFigureHelper.getShadowFigureValue((View)getModel()));
}
-
- // @Override
- // protected final void refreshLineType() {
- //
- // }
- //
- // @Override
- // protected final void refreshLineWidth() {
- //
- // }
- //
-
- @Override
- protected final void refreshForegroundColor() {
- LineStyleProvider provider = (LineStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getLineStyle());
-
- if(provider == null) {
- super.refreshForegroundColor();
- return;
- }
-
- setForegroundColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getLineColor())));
- }
-
-
- @Override
- protected void refreshFont() {
- FontStyle style = (FontStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
- if(style != null) {
- setFont(getFontData(style));
- }
- }
-
- /**
- * Update the fontData
- *
- * @param style
- * the font style of the figure
- * @return the new font data to use
- */
- protected FontData getFontData(FontStyle style) {
- FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
-
- if(provider == null) {
- return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- }
-
- return new FontData(provider.getFontName(), provider.getFontHeight(), (provider.isBold() ? SWT.BOLD : SWT.NORMAL) | (provider.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- }
-
- // @Override
- // protected final void refreshBounds() {
- //
- // }
- //
- // @Override
- // protected final void refreshVisibility() {
- //
- // }
-
- @Override
- protected final void refreshFontColor() {
- FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
- if(provider == null) {
- super.refreshFontColor();
- return;
- }
-
- setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getFontColor())));
- }
-
- protected Object getStyleProvider(EClass styleClass) {
- Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
- if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
- return null;
- }
-
- Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
- return styleProvider;
- }
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java
index 9a4f08885f4..bd547615efc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java
@@ -11,77 +11,14 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.notation.FontStyleProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontData;
-public abstract class PapyrusCompartmentEditPart extends CompartmentEditPart implements IStylableEditPart {
+public abstract class PapyrusCompartmentEditPart extends CompartmentEditPart {
public PapyrusCompartmentEditPart(EObject model) {
super(model);
}
- @Override
- protected void refreshVisuals() {
- super.refreshVisuals();
- refreshFont();
- refreshFontColor();
- }
-
- //Style support
-
- @Override
- protected void refreshFont() {
- FontStyle style = (FontStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
- if(style != null) {
- setFont(getFontData(style));
- }
- }
-
- /**
- * Update the fontData
- *
- * @param style
- * the font style of the figure
- * @return the new font data to use
- */
- protected FontData getFontData(FontStyle style) {
- FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
-
- if(provider == null) {
- return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- }
-
- return new FontData(provider.getFontName(), provider.getFontHeight(), (provider.isBold() ? SWT.BOLD : SWT.NORMAL) | (provider.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- }
-
- @Override
- protected final void refreshFontColor() {
- FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
- if(provider == null) {
- super.refreshFontColor();
- return;
- }
-
- setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getFontColor())));
- }
-
- protected Object getStyleProvider(EClass styleClass) {
- Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
- if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
- return null;
- }
-
- Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
- return styleProvider;
- }
-
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
index 52ebdbe22a1..9254819e4df 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
@@ -15,7 +15,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.View;
-public class PapyrusDiagramEditPart extends DiagramEditPart implements IStylableEditPart {
+public class PapyrusDiagramEditPart extends DiagramEditPart {
public PapyrusDiagramEditPart(View diagramView) {
super(diagramView);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
index 40f87277dc2..e2d6cca2167 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
@@ -11,77 +11,14 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.notation.FontStyleProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontData;
-public abstract class PapyrusLabelEditPart extends LabelEditPart implements IStylableEditPart {
+public abstract class PapyrusLabelEditPart extends LabelEditPart {
public PapyrusLabelEditPart(View view) {
super(view);
}
- //Style support
-
- @Override
- protected void refreshVisuals() {
- super.refreshVisuals();
- refreshFont();
- refreshFontColor();
- }
-
- @Override
- protected void refreshFont() {
- FontStyle style = (FontStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
- if(style != null) {
- setFont(getFontData(style));
- }
- }
-
- /**
- * Update the fontData
- *
- * @param style
- * the font style of the figure
- * @return the new font data to use
- */
- protected FontData getFontData(FontStyle style) {
- FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
-
- if(provider == null) {
- return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- }
-
- return new FontData(provider.getFontName(), provider.getFontHeight(), (provider.isBold() ? SWT.BOLD : SWT.NORMAL) | (provider.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- }
-
- @Override
- protected final void refreshFontColor() {
- FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
- if(provider == null) {
- super.refreshFontColor();
- return;
- }
-
- setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getFontColor())));
- }
-
- protected Object getStyleProvider(EClass styleClass) {
- Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
- if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
- return null;
- }
-
- Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
- return styleProvider;
- }
-
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java
index 51a9dcc3188..66ca08a2f50 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java
@@ -17,19 +17,12 @@ import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.notation.FontStyle;
import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.StyleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.notation.FontStyleProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontData;
-public abstract class ResizeableListCompartmentEditPart extends ListCompartmentEditPart implements IStylableEditPart {
+public abstract class ResizeableListCompartmentEditPart extends ListCompartmentEditPart {
public ResizeableListCompartmentEditPart(EObject model) {
super(model);
@@ -71,52 +64,4 @@ public abstract class ResizeableListCompartmentEditPart extends ListCompartmentE
super.handleNotificationEvent(notification);
}
- //Style support
-
- @Override
- protected void refreshFont() {
- FontStyle style = (FontStyle)getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
- if(style != null) {
- setFont(getFontData(style));
- }
- }
-
- /**
- * Update the fontData
- *
- * @param style
- * the font style of the figure
- * @return the new font data to use
- */
- protected FontData getFontData(FontStyle style) {
- FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
-
- if(provider == null) {
- return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- }
-
- return new FontData(provider.getFontName(), provider.getFontHeight(), (provider.isBold() ? SWT.BOLD : SWT.NORMAL) | (provider.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- }
-
- @Override
- protected final void refreshFontColor() {
- FontStyleProvider provider = (FontStyleProvider)getStyleProvider(NotationPackage.eINSTANCE.getFontStyle());
- if(provider == null) {
- super.refreshFontColor();
- return;
- }
-
- setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(provider.getFontColor())));
- }
-
- protected Object getStyleProvider(EClass styleClass) {
- Object styleEditPolicy = getEditPolicy(StyleEditPolicy.KEY);
- if(styleEditPolicy == null || !(styleEditPolicy instanceof StyleEditPolicy)) {
- return null;
- }
-
- Object styleProvider = ((StyleEditPolicy)styleEditPolicy).getStyle(styleClass);
- return styleProvider;
- }
-
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/AbstractStyleEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/AbstractStyleEditPolicy.java
deleted file mode 100644
index 45edc35aeec..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/AbstractStyleEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-@SuppressWarnings("restriction")
-public abstract class AbstractStyleEditPolicy extends GraphicalEditPolicyEx implements StyleEditPolicy {
-
- private final Map<EClass, Object> styleProviders = new HashMap<EClass, Object>();
-
- @Override
- public void activate() {
- super.activate();
- }
-
- @Override
- public void deactivate() {
- styleProviders.clear();
- }
-
- @Override
- public void refresh() {
- super.refresh();
- styleProviders.clear();
- }
-
- public Object getStyle(EClass styleClass) {
- if(!styleProviders.containsKey(styleClass)) {
- View view = ((IGraphicalEditPart)getHost()).getNotationView();
- styleProviders.put(styleClass, findStyle(styleClass, view));
- }
- return styleProviders.get(styleClass);
- }
-
- protected abstract Object findStyle(EClass styleClass, View view);
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/StyleEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/StyleEditPolicy.java
deleted file mode 100644
index 56e455fb903..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/StyleEditPolicy.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.gef.EditPolicy;
-
-public interface StyleEditPolicy extends EditPolicy {
-
- public static final String KEY = "StyleEditPolicy"; //$NON-NLS-1$
-
- public Object getStyle(EClass styleClass);
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java
index 0190e340998..75a7feff208 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java
@@ -14,9 +14,9 @@
package org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AssociationFigure;
import org.eclipse.papyrus.uml.diagram.clazz.custom.helper.MultiAssociationHelper;
import org.eclipse.uml2.uml.AggregationKind;
@@ -26,7 +26,7 @@ import org.eclipse.uml2.uml.Property;
/**
* this a abstract editpart use to add listeners
*/
-public abstract class AbstractAssociationBranchEditPart extends ConnectionNodeEditPart {
+public abstract class AbstractAssociationBranchEditPart extends ConnectionEditPart {
public AbstractAssociationBranchEditPart(View view) {
super(view);
@@ -36,6 +36,7 @@ public abstract class AbstractAssociationBranchEditPart extends ConnectionNodeEd
/**
* {@inheritDoc}
*/
+ @Override
public void activate() {
super.activate();
addAssociationEndListeners();
@@ -58,6 +59,7 @@ public abstract class AbstractAssociationBranchEditPart extends ConnectionNodeEd
/**
* {@inheritDoc}
*/
+ @Override
public void deactivate() {
removeAssociationEndListeners();
super.deactivate();
@@ -74,6 +76,7 @@ public abstract class AbstractAssociationBranchEditPart extends ConnectionNodeEd
* {@inheritDoc}
*/
+ @Override
protected void handleNotificationEvent(Notification event) {
super.handleNotificationEvent(event);
@@ -88,6 +91,7 @@ public abstract class AbstractAssociationBranchEditPart extends ConnectionNodeEd
*
* {@inheritDoc}
*/
+ @Override
protected void refreshVisuals() {
if(resolveSemanticElement() != null) {
if(resolveSemanticElement() instanceof Association) {
@@ -95,7 +99,7 @@ public abstract class AbstractAssociationBranchEditPart extends ConnectionNodeEd
if(target != null && target.getOwner() != null) {
int sourceType = 0;
int targetType = 0;
-
+
// aggregation?
if(target.getAggregation() == AggregationKind.SHARED_LITERAL) {
targetType += AssociationFigure.aggregation;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractCommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractCommentEditPart.java
index d3a7171ac61..f89bfa2d646 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractCommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractCommentEditPart.java
@@ -14,7 +14,9 @@
package org.eclipse.papyrus.uml.diagram.common.editparts;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
import org.eclipse.gmf.runtime.notation.FillStyle;
+import org.eclipse.gmf.runtime.notation.FontStyle;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
@@ -40,6 +42,7 @@ public class AbstractCommentEditPart extends NodeEditPart {
*
* {@inheritDoc}
*/
+ @Override
protected void handleNotificationEvent(Notification event) {
super.handleNotificationEvent(event);
@@ -55,6 +58,7 @@ public class AbstractCommentEditPart extends NodeEditPart {
*
* @since 1.2
*/
+ @Override
protected void refreshTransparency() {
FillStyle style = (FillStyle)getPrimaryView().getStyle(NotationPackage.Literals.FILL_STYLE);
if(style.getGradient() != null) {
@@ -64,27 +68,31 @@ public class AbstractCommentEditPart extends NodeEditPart {
}
}
+ @Override
protected void refreshVisuals() {
super.refreshVisuals();
refreshFontColor();
}
-// /** Refresh the editpart's figure font color. */
-// protected void refreshFontColor() {
-// FontStyle style = (FontStyle)getPrimaryView().getStyle(NotationPackage.Literals.FONT_STYLE);
-// if(style != null) {
-// setFontColor(DiagramColorRegistry.getInstance().getColor(new Integer(style.getFontColor())));
-// }
-// }
+ /** Refresh the editpart's figure font color. */
+ @Override
+ protected void refreshFontColor() {
+ FontStyle style = (FontStyle)getPrimaryView().getStyle(NotationPackage.Literals.FONT_STYLE);
+ if(style != null) {
+ setFontColor(DiagramColorRegistry.getInstance().getColor(new Integer(style.getFontColor())));
+ }
+ }
/**
* @generated
*/
+ @Override
protected void setFontColor(Color color) {
getFigure().setForegroundColor(color);
}
+ @Override
protected void setForegroundColor(Color color) {
getPrimaryShape().setBorderColor(color);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractConstraintEditPart.java
index bc35d7e5153..bf319fbfe5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractConstraintEditPart.java
@@ -13,6 +13,7 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.common.editparts;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
import org.eclipse.gmf.runtime.notation.FillStyle;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
@@ -43,7 +44,7 @@ public class AbstractConstraintEditPart extends NamedElementEditPart {
/**
*
- * @see org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart#getPrimaryShape()
+ * @see org.eclipse.papyrus.uml.diagram.common.editparts.NodeEditPart#getPrimaryShape()
*/
@Override
public IPapyrusNodeFigure getPrimaryShape() {
@@ -63,6 +64,18 @@ public class AbstractConstraintEditPart extends NamedElementEditPart {
}
}
+ @Override
+ protected void refreshBackgroundColor() {
+ FillStyle style = (FillStyle)getPrimaryView().getStyle(NotationPackage.Literals.FILL_STYLE);
+ if(style != null) {
+ if(style.getGradient() == null || !supportsGradient()) {
+ setBackgroundColor(DiagramColorRegistry.getInstance().getColor(new Integer(style.getFillColor())));
+ } else {
+ setGradient(style.getGradient());
+ }
+ }
+ }
+
/**
* Refresh figure's background transparency.
*
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractLabelEditPart.java
index cd5573b7b54..8b8010889c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractLabelEditPart.java
@@ -15,15 +15,15 @@
package org.eclipse.papyrus.uml.diagram.common.editparts;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
/**
* This is an editpart in which we can access to the wrapping label for example
* it can be use to display stereotype as external node
*/
-public abstract class AbstractLabelEditPart extends LabelEditPart implements IPapyrusEditPart {
+public abstract class AbstractLabelEditPart extends PapyrusLabelEditPart implements IPapyrusEditPart {
public AbstractLabelEditPart(View view) {
super(view);
@@ -34,7 +34,7 @@ public abstract class AbstractLabelEditPart extends LabelEditPart implements IPa
* {@inheritDoc}
*/
public IFigure getPrimaryShape() {
- return (IFigure)getFigure();
+ return getFigure();
}
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java
index 90318db5252..f68922ea0a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java
@@ -18,15 +18,15 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
import org.eclipse.papyrus.uml.diagram.common.Activator;
/**
* this edit part has in charge to display the name of a diagram for a short cut
*
*/
-public abstract class AbstractShortcutDiagramNameEditPart extends LabelEditPart implements Adapter {
+public abstract class AbstractShortcutDiagramNameEditPart extends PapyrusLabelEditPart implements Adapter {
public AbstractShortcutDiagramNameEditPart(View view) {
super(view);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AppliedStereotypePropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AppliedStereotypePropertyEditPart.java
index bb1e5c4333a..1b3759dae7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AppliedStereotypePropertyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/AppliedStereotypePropertyEditPart.java
@@ -93,12 +93,12 @@ import org.eclipse.uml2.uml.util.UMLUtil;
/**
* the goal of this editpart is to display property of stereotype in on line
- *
+ *
*/
public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart {
- public static final String ID ="AppliedStereotypeProperty";
+ public static final String ID = "AppliedStereotypeProperty";
private DirectEditManager manager;
@@ -132,13 +132,14 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#activate()
- *
+ *
*/
+ @Override
public void activate() {
super.activate();
// add listeners of listen modification on application of stereotypes
- EObject stereotypeApplication=((View)getNotationView().eContainer()).getElement();
- final Element umlElement=UMLUtil.getBaseElement(stereotypeApplication);
+ EObject stereotypeApplication = ((View)getNotationView().eContainer()).getElement();
+ final Element umlElement = UMLUtil.getBaseElement(stereotypeApplication);
getDiagramEventBroker().addNotificationListener(stereotypeApplication, this);
getDiagramEventBroker().addNotificationListener(umlElement, this);
}
@@ -146,13 +147,14 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#deactivate()
- *
+ *
*/
+ @Override
public void deactivate() {
super.deactivate();
//remove Listeners
- EObject stereotypeApplication=((View)getNotationView().eContainer()).getElement();
- final Element umlElement=UMLUtil.getBaseElement(stereotypeApplication);
+ EObject stereotypeApplication = ((View)getNotationView().eContainer()).getElement();
+ final Element umlElement = UMLUtil.getBaseElement(stereotypeApplication);
getDiagramEventBroker().removeNotificationListener(stereotypeApplication, this);
getDiagramEventBroker().removeNotificationListener(umlElement, this);
}
@@ -160,8 +162,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart#getDragTracker(org.eclipse.gef.Request)
- *
+ *
*/
+ @Override
public DragTracker getDragTracker(Request request) {
if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {
return null;
@@ -172,8 +175,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart#createDefaultEditPolicies()
- *
+ *
*/
+ @Override
protected void createDefaultEditPolicies() {
super.createDefaultEditPolicies();
//installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyForClassItemSemanticEditPolicy());
@@ -185,6 +189,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
* get the text from the figure
+ *
* @param figure
* @return
*/
@@ -200,6 +205,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
* set the text into the figure
+ *
* @param figure
* @param text
*/
@@ -215,7 +221,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
* get the icon from the figure
- * @param figure the figure
+ *
+ * @param figure
+ * the figure
* @return the icon
*/
protected Image getLabelIconHelper(IFigure figure) {
@@ -230,8 +238,10 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
* set the icon into the figure
- * @param figure get the figure
- * @param icon
+ *
+ * @param figure
+ * get the figure
+ * @param icon
*/
protected void setLabelIconHelper(IFigure figure, Image icon) {
if(figure instanceof WrappingLabel) {
@@ -253,8 +263,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getModelChildren()
- *
+ *
*/
+ @Override
@SuppressWarnings("rawtypes")
protected List getModelChildren() {
return Collections.EMPTY_LIST;
@@ -263,8 +274,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getChildBySemanticHint(java.lang.String)
- *
+ *
*/
+ @Override
public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
return null;
}
@@ -304,7 +316,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#setLabelText(java.lang.String)
- *
+ *
*/
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
@@ -321,7 +333,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getEditText()
- *
+ *
*/
public String getEditText() {
if(getParserElement() == null || getParser() == null) {
@@ -335,16 +347,17 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
* @return the label is editable
*/
protected boolean isEditable() {
- if( !(((Property)resolveSemanticElement()).isDerived())){
+ if(!(((Property)resolveSemanticElement()).isDerived())) {
return getParser() != null;
+ } else {
+ return false;
}
- else{ return false;}
}
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getEditTextValidator()
- *
+ *
*/
public ICellEditorValidator getEditTextValidator() {
return new ICellEditorValidator() {
@@ -373,10 +386,11 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
}
};
}
+
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getCompletionProcessor()
- *
+ *
*/
public IContentAssistProcessor getCompletionProcessor() {
if(getParserElement() == null || getParser() == null) {
@@ -388,7 +402,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getParserOptions()
- *
+ *
*/
public ParserOptions getParserOptions() {
return ParserOptions.NONE;
@@ -397,7 +411,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getParser()
- *
+ *
*/
public IParser getParser() {
if(parser == null) {
@@ -408,6 +422,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
* get the manager in charge of the edition
+ *
* @return the directEditManager
*/
protected DirectEditManager getManager() {
@@ -419,14 +434,17 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {
- if(source.getFigure() instanceof WrappingLabel)
+ if(source.getFigure() instanceof WrappingLabel) {
return new TextCellEditorLocator((WrappingLabel)source.getFigure());
+ }
return null;
}
+
/**
* set the manager in charge of the edition
- * @param manager
+ *
+ * @param manager
*/
protected void setManager(DirectEditManager manager) {
this.manager = manager;
@@ -434,13 +452,14 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
* perform the edtion of the label
- */
+ */
protected void performDirectEdit() {
getManager().show();
}
/**
* perform the edtion of the label
+ *
* @param eventLocation
*/
protected void performDirectEdit(Point eventLocation) {
@@ -448,6 +467,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());
}
}
+
/**
* perform the edition
*/
@@ -464,6 +484,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#performDirectEditRequest(org.eclipse.gef.Request)
*/
+ @Override
protected void performDirectEditRequest(Request request) {
final Request theRequest = request;
@@ -489,7 +510,7 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
} 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);
+ dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
} else {
return;
}
@@ -541,8 +562,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#refreshVisuals()
- *
+ *
*/
+ @Override
protected void refreshVisuals() {
super.refreshVisuals();
refreshLabel();
@@ -595,8 +617,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#refreshFont()
- *
+ *
*/
+ @Override
protected void refreshFont() {
FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
if(style != null) {
@@ -608,8 +631,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setFontColor(org.eclipse.swt.graphics.Color)
- *
+ *
*/
+ @Override
protected void setFontColor(Color color) {
getFigure().setForegroundColor(color);
}
@@ -617,13 +641,14 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#addSemanticListeners()
- *
+ *
*/
+ @Override
protected void addSemanticListeners() {
if(getParser() instanceof ISemanticParser) {
//listen stereotype application
- EObject StereotypeApplication=((View)getNotationView().eContainer()).getElement();
- addListenerFilter("SemanticModelForStereotypeApplication", this,StereotypeApplication); //$NON-NLS-1$
+ EObject StereotypeApplication = ((View)getNotationView().eContainer()).getElement();
+ addListenerFilter("SemanticModelForStereotypeApplication", this, StereotypeApplication); //$NON-NLS-1$
EObject element = resolveSemanticElement();
parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);
for(int i = 0; i < parserElements.size(); i++) {
@@ -637,8 +662,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#removeSemanticListeners()
- *
+ *
*/
+ @Override
protected void removeSemanticListeners() {
//remove listener on the stereotype application
removeListenerFilter("SemanticModelForStereotypeApplication"); //$NON-NLS-1$
@@ -654,12 +680,14 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getAccessibleEditPart()
- *
+ *
*/
+ @Override
protected AccessibleEditPart getAccessibleEditPart() {
if(accessibleEP == null) {
accessibleEP = new AccessibleGraphicalEditPart() {
+ @Override
public void getName(AccessibleEvent e) {
e.result = getLabelTextHelper(getFigure());
}
@@ -768,20 +796,24 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
e.printStackTrace();
}
}
+
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#addNotationalListeners()
- *
+ *
*/
+ @Override
protected void addNotationalListeners() {
super.addNotationalListeners();
addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
}
+
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#removeNotationalListeners()
- *
+ *
*/
+ @Override
protected void removeNotationalListeners() {
super.removeNotationalListeners();
removeListenerFilter("PrimaryView"); //$NON-NLS-1$
@@ -790,8 +822,9 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#handleNotificationEvent(org.eclipse.emf.common.notify.Notification)
- *
+ *
*/
+ @Override
protected void handleNotificationEvent(Notification event) {
Object feature = event.getFeature();
if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
@@ -824,20 +857,23 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
/**
*
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#createFigure()
- *
+ *
*/
+ @Override
protected IFigure createFigure() {
return new PropertyFigureDescriptor();
}
/**
- * this method has been overloaded in order to be able to display it into the proeprtyView
+ * this method has been overloaded in order to be able to display it into the proeprtyView
+ *
* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getAdapter(java.lang.Class)
- *
+ *
*/
+ @Override
public Object getAdapter(Class key) {
if(key == AppliedStereotypeProperty.class) {
- return new AppliedStereotypeProperty(((View)getNotationView().eContainer()).getElement(),(Property)resolveSemanticElement());
+ return new AppliedStereotypeProperty(((View)getNotationView().eContainer()).getElement(), (Property)resolveSemanticElement());
}
return null;
//return super.getAdapter(key);
@@ -888,10 +924,10 @@ public class AppliedStereotypePropertyEditPart extends UMLCompartmentEditPart im
}
}
-
+
/**
- * the figure associated to this editpart
- *
+ * the figure associated to this editpart
+ *
*/
public class PropertyFigureDescriptor extends WrappingLabel {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java
index 9dd7e074345..7fa08d1b9c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java
@@ -36,8 +36,10 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeCompa
import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
import org.eclipse.papyrus.uml.diagram.common.helper.ICompartmentLayoutHelper;
import org.eclipse.papyrus.uml.diagram.common.service.ApplyStereotypeRequest;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
import org.eclipse.uml2.uml.Element;
/**
@@ -195,7 +197,7 @@ public abstract class UMLNodeEditPart extends NodeEditPart implements IUMLEditPa
*/
@Override
protected void refreshFont() {
- FontStyle style = (FontStyle)getPrimaryView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
+ FontStyle style = (FontStyle)getPrimaryView().getStyle(NotationPackage.Literals.FONT_STYLE);
if(style != null) {
// Get the font
FontDescriptor fontDescriptor = FontDescriptor.createFrom(getFontData(style));
@@ -225,16 +227,16 @@ public abstract class UMLNodeEditPart extends NodeEditPart implements IUMLEditPa
}
- // /**
- // * Update the fontData
- // *
- // * @param style
- // * the font style of the figure
- // * @return the new font data to use
- // */
- // protected FontData getFontData(FontStyle style) {
- // return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
- // }
+ /**
+ * Update the fontData
+ *
+ * @param style
+ * the font style of the figure
+ * @return the new font data to use
+ */
+ protected FontData getFontData(FontStyle style) {
+ return new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ }
/**
* {@inheritDoc}

Back to the top