[559231] Blank metamodel generation

This commit is just a generation without any change. It was done with
this configuration:
* Eclipse 2019-12
* Formatter : "Eclipse [built-in]"
* Clean up : "Eclipse [built-in] - Without Annotations" (a copy of
  "Eclipse [built-in]" but with "Annotations" disabled to avoid
  compilation problem with "typed" list (tab "Missing Code" unckeck "Add
  missing Annotations").
* EMF 2.20 (EMF - Eclipse Modeling Framework SDK 2.20.0.v20191028-0905)

The generation was done:
* using "Generate Model Code" and "Generation Edit Code" actions from
  notation.genmodel
* and then launching "Clean up" on src folders of
  org.eclipse.gmf.runtime.notation and
  org.eclipse.gmf.runtime.notation.edit.

There are some javadoc and comment changes.
There is no real java changes except the following, but explained by
expected EMF generator changes:
* org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl
* org.eclipse.gmf.runtime.notation.impl.NotationFactoryImpl
* org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl
* org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl

Bug: 559231
Change-Id: I87b44809403004dfce611e5537f312c05ab585e2
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
Also-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
diff --git a/org.eclipse.gmf.runtime.notation.edit/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.notation.edit/META-INF/MANIFEST.MF
index 38bebff..d8917ef 100644
--- a/org.eclipse.gmf.runtime.notation.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmf.runtime.notation.edit/META-INF/MANIFEST.MF
@@ -2,16 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.gmf.runtime.notation.edit; singleton:=true
+Automatic-Module-Name: org.eclipse.gmf.runtime.notation.edit
 Bundle-Version: 1.7.0.qualifier
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.gmf.runtime.notation.NotationEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.runtime.notation,
  org.eclipse.gmf.runtime.notation.provider
-Require-Bundle: org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)",
+Require-Bundle: org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
+Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.gmf.runtime.notation.edit
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicCompartmentItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicCompartmentItemProvider.java
index 0cf5967..1ce7bf6 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicCompartmentItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicCompartmentItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
@@ -38,13 +33,7 @@
  * @since 1.2
  */
 public class BasicCompartmentItemProvider
-	extends DecorationNodeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends DecorationNodeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicDecorationNodeItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicDecorationNodeItemProvider.java
index 4e7043c..b4ec2eb 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicDecorationNodeItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicDecorationNodeItemProvider.java
@@ -18,12 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.gmf.runtime.notation.BasicDecorationNode;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
@@ -35,13 +29,7 @@
  * @since 1.2
  */
 public class BasicDecorationNodeItemProvider
-	extends NodeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends NodeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicSemanticCompartmentItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicSemanticCompartmentItemProvider.java
index c355492..8cccde6 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicSemanticCompartmentItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BasicSemanticCompartmentItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
@@ -38,13 +33,7 @@
  * @since 1.2
  */
 public class BasicSemanticCompartmentItemProvider
-	extends BasicDecorationNodeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends BasicDecorationNodeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BooleanListValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BooleanListValueStyleItemProvider.java
index 847c263..435173d 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BooleanListValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BooleanListValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.BooleanListValueStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class BooleanListValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BooleanValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BooleanValueStyleItemProvider.java
index 8aa93f1..ff283f1 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BooleanValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BooleanValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.BooleanValueStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class BooleanValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BoundsItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BoundsItemProvider.java
index 736dd14..fc1fac5 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BoundsItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/BoundsItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.Bounds;
@@ -36,13 +31,7 @@
  * @generated
  */
 public class BoundsItemProvider
-	extends LocationItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends LocationItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ByteArrayValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ByteArrayValueStyleItemProvider.java
index 3007968..5cdcf0c 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ByteArrayValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ByteArrayValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.ByteArrayValueStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class ByteArrayValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/CompartmentItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/CompartmentItemProvider.java
index 21a0f93..1dcb622 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/CompartmentItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/CompartmentItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
@@ -38,13 +33,7 @@
  * @since 1.2
  */
 public class CompartmentItemProvider
-	extends BasicCompartmentItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends BasicCompartmentItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ConnectorItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ConnectorItemProvider.java
index 7e9de18..b90507b 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ConnectorItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ConnectorItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
@@ -37,13 +32,7 @@
  * @generated
  */
 public class ConnectorItemProvider
-	extends EdgeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends EdgeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ConnectorStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ConnectorStyleItemProvider.java
index b6bd568..5bacb69 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ConnectorStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ConnectorStyleItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.ConnectorStyle;
@@ -36,13 +31,7 @@
  * @generated
  */
 public class ConnectorStyleItemProvider
-	extends RoutingStyleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends RoutingStyleItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DataTypeStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DataTypeStyleItemProvider.java
index f61fa8e..9e8232c 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DataTypeStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DataTypeStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.gmf.runtime.notation.DataTypeStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
@@ -33,13 +28,7 @@
  * @generated
  */
 public class DataTypeStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DecorationNodeItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DecorationNodeItemProvider.java
index 7f974bb..055ec24 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DecorationNodeItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DecorationNodeItemProvider.java
@@ -18,12 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.gmf.runtime.notation.DecorationNode;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
@@ -34,13 +28,7 @@
  * @generated
  */
 public class DecorationNodeItemProvider
-	extends BasicDecorationNodeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends BasicDecorationNodeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramItemProvider.java
index 5e5a313..a55fa81 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramItemProvider.java
@@ -20,11 +20,6 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.Diagram;
@@ -38,13 +33,7 @@
  * @generated
  */
 public class DiagramItemProvider
-	extends ViewItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends ViewItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramStyleItemProvider.java
index c09e89c..84475f8 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramStyleItemProvider.java
@@ -20,11 +20,6 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.DiagramStyle;
@@ -38,13 +33,7 @@
  * @generated
  */
 public class DiagramStyleItemProvider
-	extends PageStyleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends PageStyleItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DoubleListValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DoubleListValueStyleItemProvider.java
index 3435e64..b59f5b9 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DoubleListValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DoubleListValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.DoubleListValueStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class DoubleListValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DoubleValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DoubleValueStyleItemProvider.java
index bad69a1..e792e9f 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DoubleValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DoubleValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.DoubleValueStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class DoubleValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EObjectListValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EObjectListValueStyleItemProvider.java
index 936d001..192b8e4 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EObjectListValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EObjectListValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.gmf.runtime.notation.EObjectListValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
@@ -33,13 +28,7 @@
  * @generated
  */
 public class EObjectListValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EObjectValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EObjectValueStyleItemProvider.java
index d22d044..c257d0b 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EObjectValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EObjectValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.gmf.runtime.notation.EObjectValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
@@ -33,13 +28,7 @@
  * @generated
  */
 public class EObjectValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EdgeItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EdgeItemProvider.java
index 7e32c13..5b57cc7 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EdgeItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/EdgeItemProvider.java
@@ -20,11 +20,6 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.Edge;
@@ -38,13 +33,7 @@
  * @generated
  */
 public class EdgeItemProvider
-	extends ViewItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends ViewItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/HintedDiagramLinkStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/HintedDiagramLinkStyleItemProvider.java
index 6c219fe..8ab0e42 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/HintedDiagramLinkStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/HintedDiagramLinkStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class HintedDiagramLinkStyleItemProvider
-	extends DiagramLinkStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends DiagramLinkStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ImageBufferStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ImageBufferStyleItemProvider.java
index 2f0dec2..0d8a605 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ImageBufferStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ImageBufferStyleItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.ImageBufferStyle;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
@@ -36,13 +31,7 @@
  * @generated
  */
 public class ImageBufferStyleItemProvider
-	extends ImageStyleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends ImageStyleItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/IntListValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/IntListValueStyleItemProvider.java
index 8bc4de1..d3332ca 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/IntListValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/IntListValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.IntListValueStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class IntListValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/IntValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/IntValueStyleItemProvider.java
index 28d700c..8cd5e26 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/IntValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/IntValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.IntValueStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class IntValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ListCompartmentItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ListCompartmentItemProvider.java
index b874dfe..b4bbc58 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ListCompartmentItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ListCompartmentItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
@@ -37,13 +32,7 @@
  * @generated
  */
 public class ListCompartmentItemProvider
-	extends BasicCompartmentItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends BasicCompartmentItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ListValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ListValueStyleItemProvider.java
index 712ecf6..b2de0b6 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ListValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ListValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.ListValueStyle;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class ListValueStyleItemProvider
-	extends DataTypeStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends DataTypeStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/NodeItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/NodeItemProvider.java
index fd0a525..90710c5 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/NodeItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/NodeItemProvider.java
@@ -20,11 +20,6 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.Node;
@@ -38,13 +33,7 @@
  * @generated
  */
 public class NodeItemProvider
-	extends ViewItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends ViewItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/NotationItemProviderAdapterFactory.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/NotationItemProviderAdapterFactory.java
index 289846a..48f2937 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/NotationItemProviderAdapterFactory.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/NotationItemProviderAdapterFactory.java
@@ -33,43 +33,46 @@
 import org.eclipse.gmf.runtime.notation.util.NotationAdapterFactory;
 
 /**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the factory that is used to provide the interfaces needed to support
+ * Viewers. The adapters generated by this factory convert EMF adapter
+ * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The
+ * adapters also support Eclipse property sheets. Note that most of the adapters
+ * are shared among multiple instances. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
-public class NotationItemProviderAdapterFactory extends NotationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-    /**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+public class NotationItemProviderAdapterFactory extends NotationAdapterFactory
+		implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter
+	 * factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
 
-    /**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This is used to implement
+	 * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
-    /**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of all the supported types checked by
+	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection supportedTypes = new ArrayList();
 
-    /**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotationItemProviderAdapterFactory() {
@@ -80,18 +83,19 @@
 		supportedTypes.add(IItemPropertySource.class);
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Edge} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Edge} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EdgeItemProvider edgeItemProvider;
 
-    /**
+	/**
 	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Edge}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createEdgeAdapter() {
@@ -102,18 +106,19 @@
 		return edgeItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Node} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Node} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NodeItemProvider nodeItemProvider;
 
-    /**
+	/**
 	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Node}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createNodeAdapter() {
@@ -124,18 +129,20 @@
 		return nodeItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.FillStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.FillStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FillStyleItemProvider fillStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.FillStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.FillStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createFillStyleAdapter() {
@@ -146,18 +153,20 @@
 		return fillStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.LineStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.LineStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineStyleItemProvider lineStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.LineStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.LineStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createLineStyleAdapter() {
@@ -168,18 +177,20 @@
 		return lineStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.ArrowStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.ArrowStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ArrowStyleItemProvider arrowStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.ArrowStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.ArrowStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createArrowStyleAdapter() {
@@ -190,19 +201,20 @@
 		return arrowStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Shape} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Shape} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected ShapeItemProvider shapeItemProvider;
 
-				/**
+	/**
 	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Shape}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createShapeAdapter() {
@@ -213,19 +225,21 @@
 		return shapeItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Compartment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Compartment} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected CompartmentItemProvider compartmentItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Compartment}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.Compartment}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createCompartmentAdapter() {
@@ -236,19 +250,21 @@
 		return compartmentItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.ListCompartment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.ListCompartment} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected ListCompartmentItemProvider listCompartmentItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.ListCompartment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.ListCompartment}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createListCompartmentAdapter() {
@@ -259,19 +275,21 @@
 		return listCompartmentItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Connector} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Connector} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected ConnectorItemProvider connectorItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Connector}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.Connector}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createConnectorAdapter() {
@@ -282,19 +300,21 @@
 		return connectorItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.StandardDiagram} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.StandardDiagram} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected StandardDiagramItemProvider standardDiagramItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.StandardDiagram}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.StandardDiagram}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createStandardDiagramAdapter() {
@@ -305,19 +325,21 @@
 		return standardDiagramItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.DecorationNode} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.DecorationNode} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected DecorationNodeItemProvider decorationNodeItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.DecorationNode}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.DecorationNode}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDecorationNodeAdapter() {
@@ -328,19 +350,21 @@
 		return decorationNodeItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.BasicDecorationNode} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.BasicDecorationNode} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected BasicDecorationNodeItemProvider basicDecorationNodeItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.BasicDecorationNode}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.BasicDecorationNode}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createBasicDecorationNodeAdapter() {
@@ -352,18 +376,20 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.BasicCompartment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.BasicCompartment} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected BasicCompartmentItemProvider basicCompartmentItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.BasicCompartment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.BasicCompartment}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createBasicCompartmentAdapter() {
@@ -374,19 +400,21 @@
 		return basicCompartmentItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.BasicSemanticCompartment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.BasicSemanticCompartment} instances.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected BasicSemanticCompartmentItemProvider basicSemanticCompartmentItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.BasicSemanticCompartment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.BasicSemanticCompartment}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createBasicSemanticCompartmentAdapter() {
@@ -397,19 +425,21 @@
 		return basicSemanticCompartmentItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.SemanticListCompartment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.SemanticListCompartment} instances.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
 	protected SemanticListCompartmentItemProvider semanticListCompartmentItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.SemanticListCompartment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.SemanticListCompartment}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createSemanticListCompartmentAdapter() {
@@ -420,21 +450,23 @@
 		return semanticListCompartmentItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	protected RoundedCornersStyleItemProvider roundedCornersStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public Adapter createRoundedCornersStyleAdapter() {
 		if (roundedCornersStyleItemProvider == null) {
@@ -444,18 +476,20 @@
 		return roundedCornersStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.FontStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.FontStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FontStyleItemProvider fontStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.FontStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.FontStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createFontStyleAdapter() {
@@ -466,18 +500,20 @@
 		return fontStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.TitleStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.TitleStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TitleStyleItemProvider titleStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.TitleStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.TitleStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createTitleStyleAdapter() {
@@ -488,18 +524,20 @@
 		return titleStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.SortingStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.SortingStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SortingStyleItemProvider sortingStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.SortingStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.SortingStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createSortingStyleAdapter() {
@@ -510,18 +548,20 @@
 		return sortingStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.DescriptionStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.DescriptionStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DescriptionStyleItemProvider descriptionStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.DescriptionStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.DescriptionStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDescriptionStyleAdapter() {
@@ -532,18 +572,20 @@
 		return descriptionStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.TextStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.TextStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TextStyleItemProvider textStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.TextStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.TextStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createTextStyleAdapter() {
@@ -554,18 +596,20 @@
 		return textStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.LineTypeStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.LineTypeStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineTypeStyleItemProvider lineTypeStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.LineTypeStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.LineTypeStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createLineTypeStyleAdapter() {
@@ -576,18 +620,19 @@
 		return lineTypeStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Size} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Size} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SizeItemProvider sizeItemProvider;
 
-    /**
+	/**
 	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Size}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createSizeAdapter() {
@@ -598,18 +643,20 @@
 		return sizeItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Location} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Location} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LocationItemProvider locationItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Location}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.Location}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createLocationAdapter() {
@@ -620,18 +667,20 @@
 		return locationItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Bounds} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Bounds} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BoundsItemProvider boundsItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Bounds}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.Bounds}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createBoundsAdapter() {
@@ -642,18 +691,19 @@
 		return boundsItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Ratio} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Ratio} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RatioItemProvider ratioItemProvider;
 
-    /**
+	/**
 	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Ratio}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createRatioAdapter() {
@@ -664,18 +714,20 @@
 		return ratioItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.IdentityAnchor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.IdentityAnchor} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IdentityAnchorItemProvider identityAnchorItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.IdentityAnchor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.IdentityAnchor}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createIdentityAnchorAdapter() {
@@ -686,18 +738,20 @@
 		return identityAnchorItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.RoutingStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.RoutingStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RoutingStyleItemProvider routingStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.RoutingStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.RoutingStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createRoutingStyleAdapter() {
@@ -708,18 +762,20 @@
 		return routingStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.RelativeBendpoints} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.RelativeBendpoints} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RelativeBendpointsItemProvider relativeBendpointsItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.RelativeBendpoints}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.RelativeBendpoints}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createRelativeBendpointsAdapter() {
@@ -730,18 +786,20 @@
 		return relativeBendpointsItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.CanonicalStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.CanonicalStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CanonicalStyleItemProvider canonicalStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.CanonicalStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.CanonicalStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createCanonicalStyleAdapter() {
@@ -752,18 +810,20 @@
 		return canonicalStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.ShapeStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.ShapeStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ShapeStyleItemProvider shapeStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.ShapeStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.ShapeStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createShapeStyleAdapter() {
@@ -774,18 +834,20 @@
 		return shapeStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.ConnectorStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.ConnectorStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConnectorStyleItemProvider connectorStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.ConnectorStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.ConnectorStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createConnectorStyleAdapter() {
@@ -796,18 +858,20 @@
 		return connectorStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Diagram} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Diagram} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DiagramItemProvider diagramItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Diagram}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.Diagram}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDiagramAdapter() {
@@ -818,18 +882,19 @@
 		return diagramItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Image} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Image} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageItemProvider imageItemProvider;
 
-    /**
+	/**
 	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Image}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createImageAdapter() {
@@ -840,18 +905,20 @@
 		return imageItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.PageStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.PageStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PageStyleItemProvider pageStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.PageStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.PageStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createPageStyleAdapter() {
@@ -862,18 +929,20 @@
 		return pageStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.DrawerStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.DrawerStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DrawerStyleItemProvider drawerStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.DrawerStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.DrawerStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDrawerStyleAdapter() {
@@ -884,18 +953,20 @@
 		return drawerStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.GuideStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.GuideStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GuideStyleItemProvider guideStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.GuideStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.GuideStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createGuideStyleAdapter() {
@@ -906,18 +977,19 @@
 		return guideStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.Guide} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.Guide} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GuideItemProvider guideItemProvider;
 
-    /**
+	/**
 	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.Guide}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createGuideAdapter() {
@@ -928,18 +1000,18 @@
 		return guideItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NodeEntryItemProvider nodeEntryItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a {@link java.util.Map.Entry}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createNodeEntryAdapter() {
@@ -950,18 +1022,20 @@
 		return nodeEntryItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.FilteringStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.FilteringStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FilteringStyleItemProvider filteringStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.FilteringStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.FilteringStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createFilteringStyleAdapter() {
@@ -972,18 +1046,20 @@
 		return filteringStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.DiagramStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.DiagramStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DiagramStyleItemProvider diagramStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.DiagramStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.DiagramStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDiagramStyleAdapter() {
@@ -994,18 +1070,20 @@
 		return diagramStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.ImageStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.ImageStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageStyleItemProvider imageStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.ImageStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.ImageStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createImageStyleAdapter() {
@@ -1016,18 +1094,20 @@
 		return imageStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.ImageBufferStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.ImageBufferStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageBufferStyleItemProvider imageBufferStyleItemProvider;
 
-    /**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.ImageBufferStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.ImageBufferStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createImageBufferStyleAdapter() {
@@ -1038,18 +1118,20 @@
 		return imageBufferStyleItemProvider;
 	}
 
-    /**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PropertiesSetStyleItemProvider propertiesSetStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createPropertiesSetStyleAdapter() {
@@ -1060,18 +1142,18 @@
 		return propertiesSetStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry}
+	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StringToPropertyValueMapEntryItemProvider stringToPropertyValueMapEntryItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a {@link java.util.Map.Entry}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createStringToPropertyValueMapEntryAdapter() {
@@ -1082,18 +1164,20 @@
 		return stringToPropertyValueMapEntryItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.PropertyValue} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.PropertyValue} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PropertyValueItemProvider propertyValueItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.PropertyValue}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.PropertyValue}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createPropertyValueAdapter() {
@@ -1104,18 +1188,20 @@
 		return propertyValueItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.SingleValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.SingleValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SingleValueStyleItemProvider singleValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.SingleValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.SingleValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createSingleValueStyleAdapter() {
@@ -1126,18 +1212,20 @@
 		return singleValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.ListValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.ListValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ListValueStyleItemProvider listValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.ListValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.ListValueStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createListValueStyleAdapter() {
@@ -1148,18 +1236,20 @@
 		return listValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.NamedStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.NamedStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NamedStyleItemProvider namedStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.NamedStyle}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.NamedStyle}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createNamedStyleAdapter() {
@@ -1170,18 +1260,20 @@
 		return namedStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.DataTypeStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.DataTypeStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DataTypeStyleItemProvider dataTypeStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.DataTypeStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.DataTypeStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDataTypeStyleAdapter() {
@@ -1192,18 +1284,20 @@
 		return dataTypeStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.IntValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.IntValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IntValueStyleItemProvider intValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.IntValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.IntValueStyle}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createIntValueStyleAdapter() {
@@ -1214,18 +1308,20 @@
 		return intValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.IntListValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.IntListValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IntListValueStyleItemProvider intListValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.IntListValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.IntListValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createIntListValueStyleAdapter() {
@@ -1236,18 +1332,20 @@
 		return intListValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.BooleanValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.BooleanValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BooleanValueStyleItemProvider booleanValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.BooleanValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.BooleanValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createBooleanValueStyleAdapter() {
@@ -1258,18 +1356,20 @@
 		return booleanValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.DoubleValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.DoubleValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DoubleValueStyleItemProvider doubleValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.DoubleValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.DoubleValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDoubleValueStyleAdapter() {
@@ -1280,18 +1380,20 @@
 		return doubleValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DoubleListValueStyleItemProvider doubleListValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDoubleListValueStyleAdapter() {
@@ -1302,18 +1404,20 @@
 		return doubleListValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.StringValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.StringValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StringValueStyleItemProvider stringValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.StringValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.StringValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createStringValueStyleAdapter() {
@@ -1324,18 +1428,20 @@
 		return stringValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.StringListValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.StringListValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StringListValueStyleItemProvider stringListValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.StringListValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.StringListValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createStringListValueStyleAdapter() {
@@ -1346,18 +1452,20 @@
 		return stringListValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.EObjectValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.EObjectValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EObjectValueStyleItemProvider eObjectValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.EObjectValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.EObjectValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createEObjectValueStyleAdapter() {
@@ -1368,18 +1476,20 @@
 		return eObjectValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle} instances.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EObjectListValueStyleItemProvider eObjectListValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createEObjectListValueStyleAdapter() {
@@ -1390,18 +1500,20 @@
 		return eObjectListValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ByteArrayValueStyleItemProvider byteArrayValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createByteArrayValueStyleAdapter() {
@@ -1412,18 +1524,20 @@
 		return byteArrayValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle} instances.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BooleanListValueStyleItemProvider booleanListValueStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createBooleanListValueStyleAdapter() {
@@ -1434,18 +1548,20 @@
 		return booleanListValueStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle} instances.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HintedDiagramLinkStyleItemProvider hintedDiagramLinkStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createHintedDiagramLinkStyleAdapter() {
@@ -1456,18 +1572,20 @@
 		return hintedDiagramLinkStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DiagramLinkStyleItemProvider diagramLinkStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createDiagramLinkStyleAdapter() {
@@ -1478,18 +1596,20 @@
 		return diagramLinkStyleItemProvider;
 	}
 
-				/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle} instances.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MultiDiagramLinkStyleItemProvider multiDiagramLinkStyleItemProvider;
 
-				/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This creates an adapter for a
+	 * {@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter createMultiDiagramLinkStyleAdapter() {
@@ -1500,54 +1620,54 @@
 		return multiDiagramLinkStyleItemProvider;
 	}
 
-				/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This returns the root adapter factory that contains this factory. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
 
-    /**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This sets the composed adapter factory that contains this factory. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isFactoryForType(Object type) {
 		return supportedTypes.contains(type) || super.isFactoryForType(type);
 	}
 
-    /**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This implementation substitutes the factory itself as the key for the
+	 * adapter. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Adapter adapt(Notifier notifier, Object type) {
 		return super.adapt(notifier, this);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object adapt(Object object, Object type) {
 		if (isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) {
+			if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -1555,30 +1675,28 @@
 		return null;
 	}
 
-    /**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
 
-    /**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
 
-    /**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This delegates to {@link #changeNotifier} and to
+	 * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
@@ -1589,77 +1707,141 @@
 		}
 	}
 
-    /**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * This disposes all of the item providers created by this factory. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void dispose() {
-		if (edgeItemProvider != null) edgeItemProvider.dispose();
-		if (nodeItemProvider != null) nodeItemProvider.dispose();
-		if (fillStyleItemProvider != null) fillStyleItemProvider.dispose();
-		if (lineStyleItemProvider != null) lineStyleItemProvider.dispose();
-		if (fontStyleItemProvider != null) fontStyleItemProvider.dispose();
-		if (titleStyleItemProvider != null) titleStyleItemProvider.dispose();
-		if (sortingStyleItemProvider != null) sortingStyleItemProvider.dispose();
-		if (descriptionStyleItemProvider != null) descriptionStyleItemProvider.dispose();
-		if (sizeItemProvider != null) sizeItemProvider.dispose();
-		if (locationItemProvider != null) locationItemProvider.dispose();
-		if (boundsItemProvider != null) boundsItemProvider.dispose();
-		if (ratioItemProvider != null) ratioItemProvider.dispose();
-		if (identityAnchorItemProvider != null) identityAnchorItemProvider.dispose();
-		if (routingStyleItemProvider != null) routingStyleItemProvider.dispose();
-		if (relativeBendpointsItemProvider != null) relativeBendpointsItemProvider.dispose();
-		if (diagramItemProvider != null) diagramItemProvider.dispose();
-		if (imageItemProvider != null) imageItemProvider.dispose();
-		if (canonicalStyleItemProvider != null) canonicalStyleItemProvider.dispose();
-		if (shapeStyleItemProvider != null) shapeStyleItemProvider.dispose();
-		if (connectorStyleItemProvider != null) connectorStyleItemProvider.dispose();
-		if (pageStyleItemProvider != null) pageStyleItemProvider.dispose();
-		if (drawerStyleItemProvider != null) drawerStyleItemProvider.dispose();
-		if (guideStyleItemProvider != null) guideStyleItemProvider.dispose();
-		if (guideItemProvider != null) guideItemProvider.dispose();
-		if (nodeEntryItemProvider != null) nodeEntryItemProvider.dispose();
-		if (filteringStyleItemProvider != null) filteringStyleItemProvider.dispose();
-		if (diagramStyleItemProvider != null) diagramStyleItemProvider.dispose();
-		if (imageStyleItemProvider != null) imageStyleItemProvider.dispose();
-		if (imageBufferStyleItemProvider != null) imageBufferStyleItemProvider.dispose();
-		if (propertiesSetStyleItemProvider != null) propertiesSetStyleItemProvider.dispose();
-		if (stringToPropertyValueMapEntryItemProvider != null) stringToPropertyValueMapEntryItemProvider.dispose();
-		if (propertyValueItemProvider != null) propertyValueItemProvider.dispose();
-		if (singleValueStyleItemProvider != null) singleValueStyleItemProvider.dispose();
-		if (listValueStyleItemProvider != null) listValueStyleItemProvider.dispose();
-		if (namedStyleItemProvider != null) namedStyleItemProvider.dispose();
-		if (dataTypeStyleItemProvider != null) dataTypeStyleItemProvider.dispose();
-		if (intValueStyleItemProvider != null) intValueStyleItemProvider.dispose();
-		if (intListValueStyleItemProvider != null) intListValueStyleItemProvider.dispose();
-		if (booleanValueStyleItemProvider != null) booleanValueStyleItemProvider.dispose();
-		if (doubleValueStyleItemProvider != null) doubleValueStyleItemProvider.dispose();
-		if (doubleListValueStyleItemProvider != null) doubleListValueStyleItemProvider.dispose();
-		if (stringValueStyleItemProvider != null) stringValueStyleItemProvider.dispose();
-		if (stringListValueStyleItemProvider != null) stringListValueStyleItemProvider.dispose();
-		if (eObjectValueStyleItemProvider != null) eObjectValueStyleItemProvider.dispose();
-		if (eObjectListValueStyleItemProvider != null) eObjectListValueStyleItemProvider.dispose();
-		if (byteArrayValueStyleItemProvider != null) byteArrayValueStyleItemProvider.dispose();
-		if (booleanListValueStyleItemProvider != null) booleanListValueStyleItemProvider.dispose();
-		if (hintedDiagramLinkStyleItemProvider != null) hintedDiagramLinkStyleItemProvider.dispose();
-		if (diagramLinkStyleItemProvider != null) diagramLinkStyleItemProvider.dispose();
-		if (multiDiagramLinkStyleItemProvider != null) multiDiagramLinkStyleItemProvider.dispose();
-		if (textStyleItemProvider != null) textStyleItemProvider.dispose();
-		if (lineTypeStyleItemProvider != null) lineTypeStyleItemProvider.dispose();
-		if (arrowStyleItemProvider != null) arrowStyleItemProvider.dispose();
-		if (shapeItemProvider != null) shapeItemProvider.dispose();
-		if (compartmentItemProvider != null) compartmentItemProvider.dispose();
-		if (listCompartmentItemProvider != null) listCompartmentItemProvider.dispose();
-		if (connectorItemProvider != null) connectorItemProvider.dispose();
-		if (standardDiagramItemProvider != null) standardDiagramItemProvider.dispose();
-		if (decorationNodeItemProvider != null) decorationNodeItemProvider.dispose();
-		if (basicDecorationNodeItemProvider != null) basicDecorationNodeItemProvider.dispose();
-		if (basicCompartmentItemProvider != null) basicCompartmentItemProvider.dispose();
-		if (basicSemanticCompartmentItemProvider != null) basicSemanticCompartmentItemProvider.dispose();
-		if (semanticListCompartmentItemProvider != null) semanticListCompartmentItemProvider.dispose();
-		if (roundedCornersStyleItemProvider != null) roundedCornersStyleItemProvider.dispose();
+		if (edgeItemProvider != null)
+			edgeItemProvider.dispose();
+		if (nodeItemProvider != null)
+			nodeItemProvider.dispose();
+		if (fillStyleItemProvider != null)
+			fillStyleItemProvider.dispose();
+		if (lineStyleItemProvider != null)
+			lineStyleItemProvider.dispose();
+		if (fontStyleItemProvider != null)
+			fontStyleItemProvider.dispose();
+		if (titleStyleItemProvider != null)
+			titleStyleItemProvider.dispose();
+		if (sortingStyleItemProvider != null)
+			sortingStyleItemProvider.dispose();
+		if (descriptionStyleItemProvider != null)
+			descriptionStyleItemProvider.dispose();
+		if (sizeItemProvider != null)
+			sizeItemProvider.dispose();
+		if (locationItemProvider != null)
+			locationItemProvider.dispose();
+		if (boundsItemProvider != null)
+			boundsItemProvider.dispose();
+		if (ratioItemProvider != null)
+			ratioItemProvider.dispose();
+		if (identityAnchorItemProvider != null)
+			identityAnchorItemProvider.dispose();
+		if (routingStyleItemProvider != null)
+			routingStyleItemProvider.dispose();
+		if (relativeBendpointsItemProvider != null)
+			relativeBendpointsItemProvider.dispose();
+		if (diagramItemProvider != null)
+			diagramItemProvider.dispose();
+		if (imageItemProvider != null)
+			imageItemProvider.dispose();
+		if (canonicalStyleItemProvider != null)
+			canonicalStyleItemProvider.dispose();
+		if (shapeStyleItemProvider != null)
+			shapeStyleItemProvider.dispose();
+		if (connectorStyleItemProvider != null)
+			connectorStyleItemProvider.dispose();
+		if (pageStyleItemProvider != null)
+			pageStyleItemProvider.dispose();
+		if (drawerStyleItemProvider != null)
+			drawerStyleItemProvider.dispose();
+		if (guideStyleItemProvider != null)
+			guideStyleItemProvider.dispose();
+		if (guideItemProvider != null)
+			guideItemProvider.dispose();
+		if (nodeEntryItemProvider != null)
+			nodeEntryItemProvider.dispose();
+		if (filteringStyleItemProvider != null)
+			filteringStyleItemProvider.dispose();
+		if (diagramStyleItemProvider != null)
+			diagramStyleItemProvider.dispose();
+		if (imageStyleItemProvider != null)
+			imageStyleItemProvider.dispose();
+		if (imageBufferStyleItemProvider != null)
+			imageBufferStyleItemProvider.dispose();
+		if (propertiesSetStyleItemProvider != null)
+			propertiesSetStyleItemProvider.dispose();
+		if (stringToPropertyValueMapEntryItemProvider != null)
+			stringToPropertyValueMapEntryItemProvider.dispose();
+		if (propertyValueItemProvider != null)
+			propertyValueItemProvider.dispose();
+		if (singleValueStyleItemProvider != null)
+			singleValueStyleItemProvider.dispose();
+		if (listValueStyleItemProvider != null)
+			listValueStyleItemProvider.dispose();
+		if (namedStyleItemProvider != null)
+			namedStyleItemProvider.dispose();
+		if (dataTypeStyleItemProvider != null)
+			dataTypeStyleItemProvider.dispose();
+		if (intValueStyleItemProvider != null)
+			intValueStyleItemProvider.dispose();
+		if (intListValueStyleItemProvider != null)
+			intListValueStyleItemProvider.dispose();
+		if (booleanValueStyleItemProvider != null)
+			booleanValueStyleItemProvider.dispose();
+		if (doubleValueStyleItemProvider != null)
+			doubleValueStyleItemProvider.dispose();
+		if (doubleListValueStyleItemProvider != null)
+			doubleListValueStyleItemProvider.dispose();
+		if (stringValueStyleItemProvider != null)
+			stringValueStyleItemProvider.dispose();
+		if (stringListValueStyleItemProvider != null)
+			stringListValueStyleItemProvider.dispose();
+		if (eObjectValueStyleItemProvider != null)
+			eObjectValueStyleItemProvider.dispose();
+		if (eObjectListValueStyleItemProvider != null)
+			eObjectListValueStyleItemProvider.dispose();
+		if (byteArrayValueStyleItemProvider != null)
+			byteArrayValueStyleItemProvider.dispose();
+		if (booleanListValueStyleItemProvider != null)
+			booleanListValueStyleItemProvider.dispose();
+		if (hintedDiagramLinkStyleItemProvider != null)
+			hintedDiagramLinkStyleItemProvider.dispose();
+		if (diagramLinkStyleItemProvider != null)
+			diagramLinkStyleItemProvider.dispose();
+		if (multiDiagramLinkStyleItemProvider != null)
+			multiDiagramLinkStyleItemProvider.dispose();
+		if (textStyleItemProvider != null)
+			textStyleItemProvider.dispose();
+		if (lineTypeStyleItemProvider != null)
+			lineTypeStyleItemProvider.dispose();
+		if (arrowStyleItemProvider != null)
+			arrowStyleItemProvider.dispose();
+		if (shapeItemProvider != null)
+			shapeItemProvider.dispose();
+		if (compartmentItemProvider != null)
+			compartmentItemProvider.dispose();
+		if (listCompartmentItemProvider != null)
+			listCompartmentItemProvider.dispose();
+		if (connectorItemProvider != null)
+			connectorItemProvider.dispose();
+		if (standardDiagramItemProvider != null)
+			standardDiagramItemProvider.dispose();
+		if (decorationNodeItemProvider != null)
+			decorationNodeItemProvider.dispose();
+		if (basicDecorationNodeItemProvider != null)
+			basicDecorationNodeItemProvider.dispose();
+		if (basicCompartmentItemProvider != null)
+			basicCompartmentItemProvider.dispose();
+		if (basicSemanticCompartmentItemProvider != null)
+			basicSemanticCompartmentItemProvider.dispose();
+		if (semanticListCompartmentItemProvider != null)
+			semanticListCompartmentItemProvider.dispose();
+		if (roundedCornersStyleItemProvider != null)
+			roundedCornersStyleItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/PropertiesSetStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/PropertiesSetStyleItemProvider.java
index 20edab3..5b731aa 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/PropertiesSetStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/PropertiesSetStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class PropertiesSetStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/RoutingStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/RoutingStyleItemProvider.java
index c8791cd..200c89a 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/RoutingStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/RoutingStyleItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
@@ -36,13 +31,7 @@
  * @generated
  */
 public class RoutingStyleItemProvider
-	extends RoundedCornersStyleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends RoundedCornersStyleItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/SemanticListCompartmentItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/SemanticListCompartmentItemProvider.java
index 2ddd1ad..03aa17f 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/SemanticListCompartmentItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/SemanticListCompartmentItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
@@ -38,13 +33,7 @@
  * @since 1.2
  */
 public class SemanticListCompartmentItemProvider
-	extends BasicSemanticCompartmentItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends BasicSemanticCompartmentItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ShapeItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ShapeItemProvider.java
index 8e92e7d..d57b0da 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ShapeItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ShapeItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
@@ -37,13 +32,7 @@
  * @generated
  */
 public class ShapeItemProvider
-	extends NodeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends NodeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ShapeStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ShapeStyleItemProvider.java
index 95f5fc2..a303d22 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ShapeStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ShapeStyleItemProvider.java
@@ -19,11 +19,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
@@ -36,13 +31,7 @@
  * @generated
  */
 public class ShapeStyleItemProvider
-	extends FontStyleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends FontStyleItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -211,7 +200,7 @@
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	protected void addRoundedBendpointsRadiusPropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/SingleValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/SingleValueStyleItemProvider.java
index 697d254..85bd427 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/SingleValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/SingleValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class SingleValueStyleItemProvider
-	extends DataTypeStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends DataTypeStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StandardDiagramItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StandardDiagramItemProvider.java
index 232c444..71def86 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StandardDiagramItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StandardDiagramItemProvider.java
@@ -20,12 +20,6 @@
 
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
@@ -40,13 +34,7 @@
  * @since 1.2
  */
 public class StandardDiagramItemProvider
-	extends DiagramItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends DiagramItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StringListValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StringListValueStyleItemProvider.java
index 74bc26d..6cf1e93 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StringListValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StringListValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class StringListValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StringValueStyleItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StringValueStyleItemProvider.java
index b8569d7..e0f120a 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StringValueStyleItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/StringValueStyleItemProvider.java
@@ -18,11 +18,6 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
@@ -35,13 +30,7 @@
  * @generated
  */
 public class StringValueStyleItemProvider
-	extends NamedStyleItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
+	extends NamedStyleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ViewItemProvider.java b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ViewItemProvider.java
index 76311e6..eea58f7 100644
--- a/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ViewItemProvider.java
+++ b/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/ViewItemProvider.java
@@ -22,11 +22,6 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
@@ -41,13 +36,7 @@
  * @generated
  */
 public class ViewItemProvider
-	extends EModelElementItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends EModelElementItemProvider {
     /**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.gmf.runtime.notation/.settings/.api_filters b/org.eclipse.gmf.runtime.notation/.settings/.api_filters
index a5dbef0..87c8358 100644
--- a/org.eclipse.gmf.runtime.notation/.settings/.api_filters
+++ b/org.eclipse.gmf.runtime.notation/.settings/.api_filters
@@ -8,6 +8,14 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/gmf/runtime/notation/Shape.java" type="org.eclipse.gmf.runtime.notation.Shape">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="ShapeStyle"/>
+                <message_argument value="Shape"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/gmf/runtime/notation/impl/RelativeBendpointsImpl.java" type="org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl">
         <filter id="338849923">
             <message_arguments>
diff --git a/org.eclipse.gmf.runtime.notation/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.notation/META-INF/MANIFEST.MF
index f714dc7..54665c2 100644
--- a/org.eclipse.gmf.runtime.notation/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmf.runtime.notation/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.gmf.runtime.notation;singleton:=true
+Automatic-Module-Name: org.eclipse.gmf.runtime.notation
 Bundle-Version: 1.9.0.qualifier
 Bundle-Activator: org.eclipse.gmf.runtime.notation.NotationPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,7 +13,8 @@
  org.eclipse.gmf.runtime.notation.stylepooling,
  org.eclipse.gmf.runtime.notation.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
+Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-ExtensibleAPI: true
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Alignment.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Alignment.java
index 8678e73..568c2f5 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Alignment.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Alignment.java
@@ -19,10 +19,10 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Alignment</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Alignment</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getAlignment()
  * @model
  * @generated
@@ -31,10 +31,10 @@
  * @canBeSeenBy %level1
  */
 public final class Alignment extends AbstractEnumerator {
-    /**
-	 * The '<em><b>Left</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Left</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #LEFT_LITERAL
 	 * @model name="Left"
 	 * @generated
@@ -42,10 +42,10 @@
 	 */
 	public static final int LEFT = 0;
 
-    /**
-	 * The '<em><b>Right</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Right</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #RIGHT_LITERAL
 	 * @model name="Right"
 	 * @generated
@@ -53,10 +53,10 @@
 	 */
 	public static final int RIGHT = 1;
 
-    /**
-	 * The '<em><b>Center</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Center</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #CENTER_LITERAL
 	 * @model name="Center"
 	 * @generated
@@ -64,10 +64,10 @@
 	 */
 	public static final int CENTER = 2;
 
-    /**
-	 * The '<em><b>Top</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Top</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #TOP_LITERAL
 	 * @model name="Top"
 	 * @generated
@@ -75,10 +75,10 @@
 	 */
 	public static final int TOP = 3;
 
-    /**
-	 * The '<em><b>Bottom</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Bottom</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #BOTTOM_LITERAL
 	 * @model name="Bottom"
 	 * @generated
@@ -86,83 +86,79 @@
 	 */
 	public static final int BOTTOM = 4;
 
-    /**
-	 * The '<em><b>Left</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Left</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #LEFT
 	 * @generated
 	 * @ordered
 	 */
 	public static final Alignment LEFT_LITERAL = new Alignment(LEFT, "Left", "Left"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Right</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Right</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #RIGHT
 	 * @generated
 	 * @ordered
 	 */
 	public static final Alignment RIGHT_LITERAL = new Alignment(RIGHT, "Right", "Right"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Center</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Center</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #CENTER
 	 * @generated
 	 * @ordered
 	 */
 	public static final Alignment CENTER_LITERAL = new Alignment(CENTER, "Center", "Center"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Top</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Top</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #TOP
 	 * @generated
 	 * @ordered
 	 */
 	public static final Alignment TOP_LITERAL = new Alignment(TOP, "Top", "Top"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Bottom</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Bottom</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #BOTTOM
 	 * @generated
 	 * @ordered
 	 */
 	public static final Alignment BOTTOM_LITERAL = new Alignment(BOTTOM, "Bottom", "Bottom"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Alignment</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Alignment</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final Alignment[] VALUES_ARRAY =
-        new Alignment[] {
-			LEFT_LITERAL,
-			RIGHT_LITERAL,
-			CENTER_LITERAL,
-			TOP_LITERAL,
-			BOTTOM_LITERAL,
-		};
+	private static final Alignment[] VALUES_ARRAY = new Alignment[] { LEFT_LITERAL, RIGHT_LITERAL, CENTER_LITERAL,
+			TOP_LITERAL, BOTTOM_LITERAL, };
 
-    /**
+	/**
 	 * A public read-only list of all the '<em><b>Alignment</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Alignment</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Alignment</b></em>' literal with the specified literal
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Alignment get(String literal) {
@@ -175,13 +171,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Alignment</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Alignment</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static Alignment getByName(String name) {
+	public static Alignment getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			Alignment result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -191,31 +189,38 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Alignment</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Alignment</b></em>' literal with the specified integer
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Alignment get(int value) {
 		switch (value) {
-			case LEFT: return LEFT_LITERAL;
-			case RIGHT: return RIGHT_LITERAL;
-			case CENTER: return CENTER_LITERAL;
-			case TOP: return TOP_LITERAL;
-			case BOTTOM: return BOTTOM_LITERAL;
+		case LEFT:
+			return LEFT_LITERAL;
+		case RIGHT:
+			return RIGHT_LITERAL;
+		case CENTER:
+			return CENTER_LITERAL;
+		case TOP:
+			return TOP_LITERAL;
+		case BOTTOM:
+			return BOTTOM_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private Alignment(int value, String name, String literal) {
+	private Alignment(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //Alignment
+} // Alignment
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Anchor.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Anchor.java
index 81cd7d4..af6860e 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Anchor.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Anchor.java
@@ -15,11 +15,11 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Anchor</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Anchor</b></em>'.
  * <p>
- * An anchor is a routing constraint installed on edges to identify 
- * where the source/target views should anchor that edge.
+ * An anchor is a routing constraint installed on edges to identify where the
+ * source/target views should anchor that edge.
  * </p>
  * <!-- end-user-doc -->
  *
@@ -31,6 +31,6 @@
 /*
  * @canBeSeenBy %partners
  */
-public interface Anchor extends EObject{
+public interface Anchor extends EObject {
 	// no default API
 } // Anchor
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ArrowStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ArrowStyle.java
index d52b32b..5466eb8 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ArrowStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ArrowStyle.java
@@ -11,19 +11,19 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Arrow Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Arrow
+ * Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowSource <em>Arrow Source</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowTarget <em>Arrow Target</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowSource
+ * <em>Arrow Source</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowTarget
+ * <em>Arrow Target</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getArrowStyle()
  * @model
@@ -31,15 +31,15 @@
  */
 public interface ArrowStyle extends Style {
 	/**
-	 * Returns the value of the '<em><b>Arrow Source</b></em>' attribute.
-	 * The default value is <code>"None"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.ArrowType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Arrow Source</b></em>' attribute. The
+	 * default value is <code>"None"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.ArrowType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Arrow Source</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Arrow Source</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Arrow Source</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowType
 	 * @see #setArrowSource(ArrowType)
@@ -50,9 +50,10 @@
 	ArrowType getArrowSource();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowSource <em>Arrow Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowSource <em>Arrow
+	 * Source</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Arrow Source</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowType
 	 * @see #getArrowSource()
@@ -61,15 +62,15 @@
 	void setArrowSource(ArrowType value);
 
 	/**
-	 * Returns the value of the '<em><b>Arrow Target</b></em>' attribute.
-	 * The default value is <code>"None"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.ArrowType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Arrow Target</b></em>' attribute. The
+	 * default value is <code>"None"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.ArrowType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Arrow Target</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Arrow Target</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Arrow Target</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowType
 	 * @see #setArrowTarget(ArrowType)
@@ -80,9 +81,10 @@
 	ArrowType getArrowTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowTarget <em>Arrow Target</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowTarget <em>Arrow
+	 * Target</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Arrow Target</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowType
 	 * @see #getArrowTarget()
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ArrowType.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ArrowType.java
index 57039b8..99ac5cf 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ArrowType.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ArrowType.java
@@ -18,23 +18,23 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Arrow Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Arrow Type</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getArrowType()
  * @model
  * @generated
  */
 public final class ArrowType extends AbstractEnumerator {
 	/**
-	 * The '<em><b>None</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>None</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NONE_LITERAL
 	 * @model name="None"
 	 * @generated
@@ -43,13 +43,13 @@
 	public static final int NONE = 0;
 
 	/**
-	 * The '<em><b>Open Arrow</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Open Arrow</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Open Arrow</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OPEN_ARROW_LITERAL
 	 * @model name="OpenArrow"
 	 * @generated
@@ -58,13 +58,13 @@
 	public static final int OPEN_ARROW = 1;
 
 	/**
-	 * The '<em><b>Solid Arrow</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Solid Arrow</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Solid Arrow</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SOLID_ARROW_LITERAL
 	 * @model name="SolidArrow"
 	 * @generated
@@ -73,9 +73,9 @@
 	public static final int SOLID_ARROW = 2;
 
 	/**
-	 * The '<em><b>None</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>None</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE
 	 * @generated
 	 * @ordered
@@ -83,9 +83,9 @@
 	public static final ArrowType NONE_LITERAL = new ArrowType(NONE, "None", "None"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Open Arrow</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Open Arrow</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #OPEN_ARROW
 	 * @generated
 	 * @ordered
@@ -93,9 +93,9 @@
 	public static final ArrowType OPEN_ARROW_LITERAL = new ArrowType(OPEN_ARROW, "OpenArrow", "OpenArrow"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Solid Arrow</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Solid Arrow</b></em>' literal object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SOLID_ARROW
 	 * @generated
 	 * @ordered
@@ -103,30 +103,28 @@
 	public static final ArrowType SOLID_ARROW_LITERAL = new ArrowType(SOLID_ARROW, "SolidArrow", "SolidArrow"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * An array of all the '<em><b>Arrow Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Arrow Type</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ArrowType[] VALUES_ARRAY =
-		new ArrowType[] {
-			NONE_LITERAL,
-			OPEN_ARROW_LITERAL,
-			SOLID_ARROW_LITERAL,
-		};
+	private static final ArrowType[] VALUES_ARRAY = new ArrowType[] { NONE_LITERAL, OPEN_ARROW_LITERAL,
+			SOLID_ARROW_LITERAL, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Arrow Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Arrow Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Arrow Type</b></em>' literal with the specified literal
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ArrowType get(String literal) {
@@ -141,8 +139,10 @@
 
 	/**
 	 * Returns the '<em><b>Arrow Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ArrowType getByName(String name) {
@@ -156,28 +156,33 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Arrow Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Arrow Type</b></em>' literal with the specified integer
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ArrowType get(int value) {
 		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case OPEN_ARROW: return OPEN_ARROW_LITERAL;
-			case SOLID_ARROW: return SOLID_ARROW_LITERAL;
+		case NONE:
+			return NONE_LITERAL;
+		case OPEN_ARROW:
+			return OPEN_ARROW_LITERAL;
+		case SOLID_ARROW:
+			return SOLID_ARROW_LITERAL;
 		}
 		return null;
 	}
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ArrowType(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //ArrowType
+} // ArrowType
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicCompartment.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicCompartment.java
index 799a4c8..a19f030 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicCompartment.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicCompartment.java
@@ -11,17 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Basic Compartment</b></em>'.
- * <p><b>
- * Does not support addition/removal of:
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Basic
+ * Compartment</b></em>'.
+ * <p>
+ * <b> Does not support addition/removal of:
  * <ul>
  * <li>Source Edges
- * <li>Target Edges 
+ * <li>Target Edges
  * </ul>
- * </b></p> 
+ * </b>
+ * </p>
  * <!-- end-user-doc -->
  *
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicDecorationNode.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicDecorationNode.java
index 5f0855e..4437b7b 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicDecorationNode.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicDecorationNode.java
@@ -11,12 +11,11 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Basic Decoration Node</b></em>'.
- * <p><b>
- * Does not support addition/removal of:
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Basic
+ * Decoration Node</b></em>'.
+ * <p>
+ * <b> Does not support addition/removal of:
  * <ul>
  * <li>Source Edges
  * <li>Target Edges
@@ -24,14 +23,17 @@
  * <li>Children
  * <li>Styles
  * </ul>
- * </b></p> 
- * <p><b>Generated subclasses must have the following methods fixed:
+ * </b>
+ * </p>
+ * <p>
+ * <b>Generated subclasses must have the following methods fixed:
  * <ul>
  * <li>{@link #eIsSet(org.eclipse.emf.ecore.EStructuralFeature)}
  * <li>{@link #eSet(org.eclipse.emf.ecore.EStructuralFeature, Object)}
  * <li>{@link #eUnset(org.eclipse.emf.ecore.EStructuralFeature)}
  * </ul>
- * </b></p> 
+ * </b>
+ * </p>
  * <!-- end-user-doc -->
  *
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicSemanticCompartment.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicSemanticCompartment.java
index f65703c..a2c52de 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicSemanticCompartment.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BasicSemanticCompartment.java
@@ -11,12 +11,11 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Basic Semantic Compartment</b></em>'.
- * <p><b>
- * Does not support addition/removal of:
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Basic
+ * Semantic Compartment</b></em>'.
+ * <p>
+ * <b> Does not support addition/removal of:
  * <ul>
  * <li>Source Edges
  * <li>Target Edges
@@ -24,7 +23,8 @@
  * <li>Children
  * <li>Styles
  * </ul>
- * </b></p> 
+ * </b>
+ * </p>
  * <!-- end-user-doc -->
  *
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Bendpoints.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Bendpoints.java
index 3f450fe..489fa02 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Bendpoints.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Bendpoints.java
@@ -15,11 +15,11 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bendpoints</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Bendpoints</b></em>'.
  * <p>
- * A bendpoints is a routing constraint installed on edges to suggest 
- * that their routing pass through a specific collection of points
+ * A bendpoints is a routing constraint installed on edges to suggest that their
+ * routing pass through a specific collection of points
  * </p>
  * <!-- end-user-doc -->
  *
@@ -31,6 +31,6 @@
 /*
  * @canBeSeenBy %level1
  */
-public interface Bendpoints extends EObject{
+public interface Bendpoints extends EObject {
 	// No default API
 } // Bendpoints
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BooleanListValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BooleanListValueStyle.java
index 1476760..5d0b637 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BooleanListValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BooleanListValueStyle.java
@@ -14,16 +14,16 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Boolean
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle#getBooleanListValue
+ * <em>Boolean List Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getBooleanListValueStyle()
  * @model
@@ -32,13 +32,14 @@
 public interface BooleanListValueStyle extends NamedStyle {
 	/**
 	 * Returns the value of the '<em><b>Boolean List Value</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.Boolean}.
-	 * <!-- begin-user-doc -->
+	 * The list contents are of type {@link java.lang.Boolean}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Boolean List Value</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Boolean List Value</em>' attribute list isn't
+	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Boolean List Value</em>' attribute list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getBooleanListValueStyle_BooleanListValue()
 	 * @model unique="false"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BooleanValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BooleanValueStyle.java
index 9d7b292..b73d7f2 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BooleanValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/BooleanValueStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Boolean
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle#isBooleanValue
+ * <em>Boolean Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getBooleanValueStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface BooleanValueStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>Boolean Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Boolean Value</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Boolean Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Boolean Value</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Boolean Value</em>' attribute.
 	 * @see #setBooleanValue(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getBooleanValueStyle_BooleanValue()
@@ -46,9 +46,11 @@
 	boolean isBooleanValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle#isBooleanValue
+	 * <em>Boolean Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>Boolean Value</em>' attribute.
 	 * @see #isBooleanValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Bounds.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Bounds.java
index 392d281..0bcb4d2 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Bounds.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Bounds.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bounds</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Bounds</b></em>'.
  * <p>
  * Bounds are layout constraints for nodes to specify their location and size
  * </p>
@@ -29,6 +28,6 @@
 /*
  * @canBeSeenBy %partners
  */
-public interface Bounds extends Location, Size{
+public interface Bounds extends Location, Size {
 	// no default API
 } // Bounds
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ByteArrayValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ByteArrayValueStyle.java
index 3b80489..a663b68 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ByteArrayValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ByteArrayValueStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Byte Array Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Byte
+ * Array Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle#getByteArrayValue <em>Byte Array Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle#getByteArrayValue
+ * <em>Byte Array Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getByteArrayValueStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface ByteArrayValueStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>Byte Array Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Byte Array Value</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Byte Array Value</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Byte Array Value</em>' attribute.
 	 * @see #setByteArrayValue(byte[])
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getByteArrayValueStyle_ByteArrayValue()
@@ -46,9 +46,11 @@
 	byte[] getByteArrayValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle#getByteArrayValue <em>Byte Array Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle#getByteArrayValue
+	 * <em>Byte Array Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Byte Array Value</em>' attribute.
 	 * @see #getByteArrayValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/CanonicalStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/CanonicalStyle.java
index cb424ff..be4f566 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/CanonicalStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/CanonicalStyle.java
@@ -12,22 +12,23 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Canonical Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Canonical Style</b></em>'.
  * <p>
- * Canonical style is a style to be installed on views that need to be synchronized with business model
- * (i.e. notation model would be in synch with business model). Definition of 'in synch' is user-defined.
+ * Canonical style is a style to be installed on views that need to be
+ * synchronized with business model (i.e. notation model would be in synch with
+ * business model). Definition of 'in synch' is user-defined.
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.CanonicalStyle#isCanonical <em>Canonical</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.CanonicalStyle#isCanonical
+ * <em>Canonical</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getCanonicalStyle()
  * @model
@@ -37,11 +38,10 @@
  * @canBeSeenBy %partners
  */
 public interface CanonicalStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Canonical</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Canonical</b></em>' attribute. The default
+	 * value is <code>"true"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Canonical</em>' attribute.
 	 * @see #setCanonical(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getCanonicalStyle_Canonical()
@@ -50,10 +50,11 @@
 	 */
 	boolean isCanonical();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle#isCanonical <em>Canonical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle#isCanonical
+	 * <em>Canonical</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Canonical</em>' attribute.
 	 * @see #isCanonical()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Compartment.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Compartment.java
index 7146a43..f8d32fc 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Compartment.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Compartment.java
@@ -11,17 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Compartment</b></em>'.
- * <p><b>
- * Does not support addition/removal of:
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Compartment</b></em>'.
+ * <p>
+ * <b> Does not support addition/removal of:
  * <ul>
  * <li>Source Edges
- * <li>Target Edges 
+ * <li>Target Edges
  * </ul>
- * </b></p> 
+ * </b>
+ * </p>
  * <!-- end-user-doc -->
  *
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Connector.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Connector.java
index 5e81558..3823226 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Connector.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Connector.java
@@ -11,11 +11,9 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connector</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Connector</b></em>'. <!-- end-user-doc -->
  *
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getConnector()
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ConnectorStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ConnectorStyle.java
index 5413ed5..5737576 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ConnectorStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ConnectorStyle.java
@@ -13,11 +13,11 @@
 package org.eclipse.gmf.runtime.notation;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connector Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Connector Style</b></em>'.
  * <p>
  * A connector style is a typical style to be installed on edges. It gives the
- * edge routing and line style properties 
+ * edge routing and line style properties
  * </p>
  * <!-- end-user-doc -->
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DataTypeStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DataTypeStyle.java
index 6c38d49..a78e9ef 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DataTypeStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DataTypeStyle.java
@@ -13,18 +13,17 @@
 
 import org.eclipse.emf.ecore.EDataType;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Data Type Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Data
+ * Type Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.DataTypeStyle#getInstanceType <em>Instance Type</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.DataTypeStyle#getInstanceType
+ * <em>Instance Type</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDataTypeStyle()
  * @model
@@ -33,13 +32,14 @@
 public interface DataTypeStyle extends NamedStyle, StringObjectConverter {
 
 	/**
-	 * Returns the value of the '<em><b>Instance Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Instance Type</b></em>' reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Instance Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Instance Type</em>' reference isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Instance Type</em>' reference.
 	 * @see #setInstanceType(EDataType)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDataTypeStyle_InstanceType()
@@ -49,9 +49,11 @@
 	EDataType getInstanceType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.DataTypeStyle#getInstanceType <em>Instance Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.DataTypeStyle#getInstanceType
+	 * <em>Instance Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>Instance Type</em>' reference.
 	 * @see #getInstanceType()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DecorationNode.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DecorationNode.java
index 87ef569..7a80fde 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DecorationNode.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DecorationNode.java
@@ -11,24 +11,26 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Decoration Node</b></em>'.
- * <p><b>
- * Does not support addition/removal of:
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Decoration Node</b></em>'.
+ * <p>
+ * <b> Does not support addition/removal of:
  * <ul>
  * <li>Source Edges
- * <li>Target Edges 
+ * <li>Target Edges
  * </ul>
- * </b></p> 
- * <p><b>Generated subclasses must have the following methods fixed:
+ * </b>
+ * </p>
+ * <p>
+ * <b>Generated subclasses must have the following methods fixed:
  * <ul>
  * <li>{@link #eIsSet(org.eclipse.emf.ecore.EStructuralFeature)}
  * <li>{@link #eSet(org.eclipse.emf.ecore.EStructuralFeature, Object)}
  * <li>{@link #eUnset(org.eclipse.emf.ecore.EStructuralFeature)}
  * </ul>
- * </b></p> 
+ * </b>
+ * </p>
  * <!-- end-user-doc -->
  *
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DescriptionStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DescriptionStyle.java
index 8bee25f..c3bab50 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DescriptionStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DescriptionStyle.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Description Style</b></em>'.
  * <p>
  * A style to be installed on views to give them description texts
  * </p>
@@ -23,10 +22,11 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.DescriptionStyle#getDescription <em>Description</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.DescriptionStyle#getDescription
+ * <em>Description</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDescriptionStyle()
  * @model
@@ -36,11 +36,10 @@
  * @canBeSeenBy %partners
  */
 public interface DescriptionStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute. The default
+	 * value is <code>""</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDescriptionStyle_Description()
@@ -49,10 +48,12 @@
 	 */
 	String getDescription();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle#getDescription
+	 * <em>Description</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>Description</em>' attribute.
 	 * @see #getDescription()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Diagram.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Diagram.java
index 64ae86c..62da16d 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Diagram.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Diagram.java
@@ -16,22 +16,26 @@
 import org.eclipse.emf.ecore.EClass;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram</b></em>'.
- *<p>
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Diagram</b></em>'.
+ * <p>
  * A diagram is a view that represents the top level containment of views
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Diagram#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit <em>Measurement Unit</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Diagram#getPersistedEdges <em>Persisted Edges</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Diagram#getTransientEdges <em>Transient Edges</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Diagram#getName
+ * <em>Name</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit
+ * <em>Measurement Unit</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Diagram#getPersistedEdges
+ * <em>Persisted Edges</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Diagram#getTransientEdges
+ * <em>Transient Edges</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagram()
  * @model
@@ -41,11 +45,10 @@
  * @canBeSeenBy %partners
  */
 public interface Diagram extends View {
-    /**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. The default value
+	 * is <code>""</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagram_Name()
@@ -54,26 +57,28 @@
 	 */
 	String getName();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Diagram#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram#getName <em>Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
-    /**
-	 * Returns the value of the '<em><b>Measurement Unit</b></em>' attribute.
-	 * The default value is <code>"Himetric"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.MeasurementUnit}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Measurement Unit</b></em>' attribute. The
+	 * default value is <code>"Himetric"</code>. The literals are from the
+	 * enumeration {@link org.eclipse.gmf.runtime.notation.MeasurementUnit}. <!--
+	 * begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Measurement Unit</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Measurement Unit</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.MeasurementUnit
 	 * @see #isSetMeasurementUnit()
@@ -85,10 +90,12 @@
 	 */
 	MeasurementUnit getMeasurementUnit();
 
-				/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit <em>Measurement Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit
+	 * <em>Measurement Unit</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Measurement Unit</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.MeasurementUnit
 	 * @see #isSetMeasurementUnit()
@@ -98,10 +105,12 @@
 	 */
 	void setMeasurementUnit(MeasurementUnit value);
 
-				/**
-	 * Unsets the value of the '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit <em>Measurement Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Unsets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit
+	 * <em>Measurement Unit</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isSetMeasurementUnit()
 	 * @see #getMeasurementUnit()
 	 * @see #setMeasurementUnit(MeasurementUnit)
@@ -109,11 +118,14 @@
 	 */
 	void unsetMeasurementUnit();
 
-				/**
-	 * Returns whether the value of the '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit <em>Measurement Unit</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Measurement Unit</em>' attribute is set.
+	/**
+	 * Returns whether the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit
+	 * <em>Measurement Unit</em>}' attribute is set. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return whether the value of the '<em>Measurement Unit</em>' attribute is
+	 *         set.
 	 * @see #unsetMeasurementUnit()
 	 * @see #getMeasurementUnit()
 	 * @see #setMeasurementUnit(MeasurementUnit)
@@ -121,61 +133,68 @@
 	 */
 	boolean isSetMeasurementUnit();
 
-				/**
-	 * Returns the value of the '<em><b>Edges</b></em>' list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Edge}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Edges</b></em>' list. The list contents are
+	 * of type {@link org.eclipse.gmf.runtime.notation.Edge}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Edges</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Edges</em>' containment reference list isn't
+	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Edges</em>' list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagram_Edges()
 	 */
 	EList getEdges();
 
-    /**
-	 * Returns the value of the '<em><b>Persisted Edges</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Edge}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Persisted Edges</b></em>' containment
+	 * reference list. The list contents are of type
+	 * {@link org.eclipse.gmf.runtime.notation.Edge}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Persisted Edges</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Persisted Edges</em>' containment reference list
+	 * isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persisted Edges</em>' containment reference list.
+	 * 
+	 * @return the value of the '<em>Persisted Edges</em>' containment reference
+	 *         list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagram_PersistedEdges()
 	 * @model type="org.eclipse.gmf.runtime.notation.Edge" containment="true"
 	 * @generated
 	 */
 	EList getPersistedEdges();
 
-    /**
-	 * Returns the value of the '<em><b>Transient Edges</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Edge}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Transient Edges</b></em>' containment
+	 * reference list. The list contents are of type
+	 * {@link org.eclipse.gmf.runtime.notation.Edge}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Transient Edges</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Transient Edges</em>' containment reference list
+	 * isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transient Edges</em>' containment reference list.
+	 * 
+	 * @return the value of the '<em>Transient Edges</em>' containment reference
+	 *         list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagram_TransientEdges()
-	 * @model type="org.eclipse.gmf.runtime.notation.Edge" containment="true" transient="true"
+	 * @model type="org.eclipse.gmf.runtime.notation.Edge" containment="true"
+	 *        transient="true"
 	 * @generated
 	 */
-	 EList getTransientEdges();
+	EList getTransientEdges();
 
-    /**
+	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A utililty method to create a new <code>Edge</code> from the given <code>eClass</code> paramter
-	 * and then inserts the object in the diagrams's </em>Edges</em> collection
+	 * A utililty method to create a new <code>Edge</code> from the given
+	 * <code>eClass</code> paramter and then inserts the object in the diagrams's
+	 * </em>Edges</em> collection
 	 * </p>
 	 * 
-	 * @param eClass the <code>EClass</code> to be used in creating the <code>Edge</code> object
-	 * <!-- end-user-doc -->
+	 * @param eClass the <code>EClass</code> to be used in creating the
+	 *               <code>Edge</code> object <!-- end-user-doc -->
 	 * @model
 	 * @generated
 	 */
@@ -186,34 +205,34 @@
 	 * <p>
 	 * A utililty method to insert a persisted edge
 	 * </p>
-	 * @param edge the '<em>Edge</em>' to insert.
-	 * <!-- end-user-doc -->
+	 * 
+	 * @param edge the '<em>Edge</em>' to insert. <!-- end-user-doc -->
 	 */
 	void insertEdge(Edge edge);
-	
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * A utililty method to insert a persisted edge at a specific index
 	 * </p>
+	 * 
 	 * @param edge the '<em>Edge</em>' to insert.
-	 * @param the index of the child
-	 * <!-- end-user-doc -->
+	 * @param the  index of the child <!-- end-user-doc -->
 	 */
 	void insertEdgeAt(Edge edge, int index);
-	
-	
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * A utililty method to insert a persisted or transient edge
 	 * </p>
-	 * @param edge the '<em>Edge</em>' to insert.
-	 * @param persisted, indicate if the Edge will be persisted or not
-	 * <!-- end-user-doc -->
+	 * 
+	 * @param edge       the '<em>Edge</em>' to insert.
+	 * @param persisted, indicate if the Edge will be persisted or not <!--
+	 *                   end-user-doc -->
 	 */
-	void insertEdge(Edge edge,boolean persisted);
-	
+	void insertEdge(Edge edge, boolean persisted);
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -221,16 +240,16 @@
 	 * </p>
 	 * <!-- end-user-doc -->
 	 */
-	 void persistEdges();
-	 
-	 /**
-	  * <!-- begin-user-doc -->
-	  * <p>
-	  * A utililty method to remove an edge form a diagram
-	  * </p>
-	  * @param edge the '<em>Edge</em>' to remove
-	  * <!-- end-user-doc -->
-	  */
- 	  void removeEdge(Edge edge);
+	void persistEdges();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * A utililty method to remove an edge form a diagram
+	 * </p>
+	 * 
+	 * @param edge the '<em>Edge</em>' to remove <!-- end-user-doc -->
+	 */
+	void removeEdge(Edge edge);
 
 } // Diagram
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DiagramLinkStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DiagramLinkStyle.java
index 353f002..c99df6e 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DiagramLinkStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DiagramLinkStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram Link Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Diagram
+ * Link Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle#getDiagramLink <em>Diagram Link</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle#getDiagramLink
+ * <em>Diagram Link</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagramLinkStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface DiagramLinkStyle extends Style {
 	/**
-	 * Returns the value of the '<em><b>Diagram Link</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Diagram Link</b></em>' reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Diagram Link</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Diagram Link</em>' reference isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Diagram Link</em>' reference.
 	 * @see #setDiagramLink(Diagram)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagramLinkStyle_DiagramLink()
@@ -46,9 +46,11 @@
 	Diagram getDiagramLink();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle#getDiagramLink <em>Diagram Link</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle#getDiagramLink
+	 * <em>Diagram Link</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>Diagram Link</em>' reference.
 	 * @see #getDiagramLink()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DiagramStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DiagramStyle.java
index c434d76..d4a45b3 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DiagramStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DiagramStyle.java
@@ -13,9 +13,8 @@
 package org.eclipse.gmf.runtime.notation;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Diagram
+ * Style</b></em>'. <!-- end-user-doc -->
  *
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagramStyle()
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DobleValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DobleValueStyle.java
index 5230072..40b7304 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DobleValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DobleValueStyle.java
@@ -11,16 +11,15 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Doble Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Doble
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.DobleValueStyle#getDoubleValue <em>Double Value</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.DobleValueStyle#getDoubleValue
+ * <em>Double Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -30,13 +29,14 @@
  */
 public interface DobleValueStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>Double Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Double Value</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Double Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Double Value</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Double Value</em>' attribute.
 	 * @see #setDoubleValue(double)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDobleValueStyle_DoubleValue()
@@ -46,9 +46,11 @@
 	double getDoubleValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.DobleValueStyle#getDoubleValue <em>Double Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.DobleValueStyle#getDoubleValue
+	 * <em>Double Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>Double Value</em>' attribute.
 	 * @see #getDoubleValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DoubleListValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DoubleListValueStyle.java
index 42dcf9e..99e6b6c 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DoubleListValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DoubleListValueStyle.java
@@ -14,16 +14,16 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Double List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Double
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle#getDoubleListValue
+ * <em>Double List Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDoubleListValueStyle()
  * @model
@@ -32,13 +32,14 @@
 public interface DoubleListValueStyle extends NamedStyle {
 	/**
 	 * Returns the value of the '<em><b>Double List Value</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.Double}.
-	 * <!-- begin-user-doc -->
+	 * The list contents are of type {@link java.lang.Double}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Double List Value</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Double List Value</em>' attribute list isn't
+	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Double List Value</em>' attribute list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDoubleListValueStyle_DoubleListValue()
 	 * @model unique="false"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DoubleValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DoubleValueStyle.java
index f8c0afe..c9f129d 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DoubleValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DoubleValueStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Double Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Double
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle#getDoubleValue <em>Double Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle#getDoubleValue
+ * <em>Double Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDoubleValueStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface DoubleValueStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>Double Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Double Value</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Double Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Double Value</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Double Value</em>' attribute.
 	 * @see #setDoubleValue(double)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDoubleValueStyle_DoubleValue()
@@ -46,9 +46,11 @@
 	double getDoubleValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle#getDoubleValue <em>Double Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle#getDoubleValue
+	 * <em>Double Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>Double Value</em>' attribute.
 	 * @see #getDoubleValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DrawerStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DrawerStyle.java
index 55a0171..d17ba38 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DrawerStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/DrawerStyle.java
@@ -12,21 +12,22 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Drawer Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Drawer
+ * Style</b></em>'.
  * <p>
- * a style to be installed on nodes that can be collapsed like a drawer (eg. compartments)
+ * a style to be installed on nodes that can be collapsed like a drawer (eg.
+ * compartments)
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.DrawerStyle#isCollapsed <em>Collapsed</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.DrawerStyle#isCollapsed
+ * <em>Collapsed</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDrawerStyle()
  * @model
@@ -36,11 +37,10 @@
  * @canBeSeenBy %partners
  */
 public interface DrawerStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Collapsed</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Collapsed</b></em>' attribute. The default
+	 * value is <code>"false"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Collapsed</em>' attribute.
 	 * @see #setCollapsed(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDrawerStyle_Collapsed()
@@ -49,10 +49,11 @@
 	 */
 	boolean isCollapsed();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.DrawerStyle#isCollapsed <em>Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.DrawerStyle#isCollapsed
+	 * <em>Collapsed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Collapsed</em>' attribute.
 	 * @see #isCollapsed()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/EObjectListValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/EObjectListValueStyle.java
index 4aa009a..c84a168 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/EObjectListValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/EObjectListValueStyle.java
@@ -14,16 +14,16 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EObject List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>EObject
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle#getEObjectListValue <em>EObject List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle#getEObjectListValue
+ * <em>EObject List Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEObjectListValueStyle()
  * @model
@@ -33,13 +33,14 @@
 
 	/**
 	 * Returns the value of the '<em><b>EObject List Value</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
-	 * <!-- begin-user-doc -->
+	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>EObject List Value</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>EObject List Value</em>' reference list isn't
+	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>EObject List Value</em>' reference list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEObjectListValueStyle_EObjectListValue()
 	 * @model type="org.eclipse.emf.ecore.EObject"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/EObjectValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/EObjectValueStyle.java
index 5934c83..1fc2445 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/EObjectValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/EObjectValueStyle.java
@@ -14,16 +14,16 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EObject Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>EObject
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle#getEObjectValue
+ * <em>EObject Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEObjectValueStyle()
  * @model
@@ -31,13 +31,14 @@
  */
 public interface EObjectValueStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>EObject Value</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>EObject Value</b></em>' reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>EObject Value</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>EObject Value</em>' reference isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>EObject Value</em>' reference.
 	 * @see #setEObjectValue(EObject)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEObjectValueStyle_EObjectValue()
@@ -47,9 +48,11 @@
 	EObject getEObjectValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle#getEObjectValue
+	 * <em>EObject Value</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>EObject Value</em>' reference.
 	 * @see #getEObjectValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Edge.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Edge.java
index ad754c5..593d9b4 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Edge.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Edge.java
@@ -15,8 +15,8 @@
 import org.eclipse.emf.ecore.EClass;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Edge</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Edge</b></em>'.
  * <p>
  * An edge is a view that represents a connection between two other views
  * </p>
@@ -24,14 +24,19 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Edge#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Edge#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Edge#getBendpoints <em>Bendpoints</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Edge#getSourceAnchor <em>Source Anchor</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Edge#getTargetAnchor <em>Target Anchor</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Edge#getSource
+ * <em>Source</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Edge#getTarget
+ * <em>Target</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Edge#getBendpoints
+ * <em>Bendpoints</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Edge#getSourceAnchor <em>Source
+ * Anchor</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Edge#getTargetAnchor <em>Target
+ * Anchor</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEdge()
  * @model
@@ -41,14 +46,16 @@
  * @canBeSeenBy %partners
  */
 public interface Edge extends View {
-    /**
-	 * Returns the value of the '<em><b>Source</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.runtime.notation.View#getSourceEdges <em>Source Edges</em>}'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Source</b></em>' reference. It is
+	 * bidirectional and its opposite is
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getSourceEdges <em>Source
+	 * Edges</em>}'. <!-- begin-user-doc -->
 	 * <p>
 	 * The edge's source is the view at the source of the edge
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source</em>' reference.
 	 * @see #setSource(View)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEdge_Source()
@@ -58,27 +65,30 @@
 	 */
 	View getSource();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Edge#getSource <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Edge#getSource
+	 * <em>Source</em>}' reference. <!-- begin-user-doc -->
 	 * <p>
 	 * The edge's source is the view at the source of the edge
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Source</em>' reference.
 	 * @see #getSource()
 	 * @generated
 	 */
 	void setSource(View value);
 
-    /**
-	 * Returns the value of the '<em><b>Target</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.runtime.notation.View#getTargetEdges <em>Target Edges</em>}'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Target</b></em>' reference. It is
+	 * bidirectional and its opposite is
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getTargetEdges <em>Target
+	 * Edges</em>}'. <!-- begin-user-doc -->
 	 * <p>
 	 * The edge's taregt is the view at the target of the edge
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target</em>' reference.
 	 * @see #setTarget(View)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEdge_Target()
@@ -88,27 +98,29 @@
 	 */
 	View getTarget();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Edge#getTarget <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Edge#getTarget
+	 * <em>Target</em>}' reference. <!-- begin-user-doc -->
 	 * <p>
 	 * The edge's taregt is the view at the target of the edge
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Target</em>' reference.
 	 * @see #getTarget()
 	 * @generated
 	 */
 	void setTarget(View value);
 
-    /**
+	/**
 	 * Returns the value of the '<em><b>Bendpoints</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A bendpoint is a routing constraint installed on edges to suggest that their 
+	 * A bendpoint is a routing constraint installed on edges to suggest that their
 	 * routing pass through a specific collection of points.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Bendpoints</em>' containment reference.
 	 * @see #setBendpoints(Bendpoints)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEdge_Bendpoints()
@@ -117,28 +129,32 @@
 	 */
 	Bendpoints getBendpoints();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Edge#getBendpoints <em>Bendpoints</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getBendpoints
+	 * <em>Bendpoints</em>}' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * A bendpoint is a routing constraint installed on edges to suggest that their 
+	 * A bendpoint is a routing constraint installed on edges to suggest that their
 	 * routing pass through a specific collection of points.
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bendpoints</em>' containment reference.
+	 * 
+	 * @param value the new value of the '<em>Bendpoints</em>' containment
+	 *              reference.
 	 * @see #getBendpoints()
 	 * @generated
 	 */
 	void setBendpoints(Bendpoints value);
 
-    /**
-	 * Returns the value of the '<em><b>Source Anchor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Source Anchor</b></em>' containment
+	 * reference. <!-- begin-user-doc -->
 	 * <p>
-	 * A source anchor is a routing constraint installed on edges to identify where the source
-	 * view should anchor that edge.	 
+	 * A source anchor is a routing constraint installed on edges to identify where
+	 * the source view should anchor that edge.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source Anchor</em>' containment reference.
 	 * @see #setSourceAnchor(Anchor)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEdge_SourceAnchor()
@@ -147,28 +163,32 @@
 	 */
 	Anchor getSourceAnchor();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Edge#getSourceAnchor <em>Source Anchor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getSourceAnchor <em>Source
+	 * Anchor</em>}' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * A source anchor is a routing constraint installed on edges to identify where the source
-	 * view should anchor that edge.	 
+	 * A source anchor is a routing constraint installed on edges to identify where
+	 * the source view should anchor that edge.
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Anchor</em>' containment reference.
+	 * 
+	 * @param value the new value of the '<em>Source Anchor</em>' containment
+	 *              reference.
 	 * @see #getSourceAnchor()
 	 * @generated
 	 */
 	void setSourceAnchor(Anchor value);
 
-    /**
-	 * Returns the value of the '<em><b>Target Anchor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Target Anchor</b></em>' containment
+	 * reference. <!-- begin-user-doc -->
 	 * <p>
-	 * A target anchor is a routing constraint installed on edges to identify where the target
-	 * view should anchor that edge.	 
+	 * A target anchor is a routing constraint installed on edges to identify where
+	 * the target view should anchor that edge.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Anchor</em>' containment reference.
 	 * @see #setTargetAnchor(Anchor)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getEdge_TargetAnchor()
@@ -177,57 +197,63 @@
 	 */
 	Anchor getTargetAnchor();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Edge#getTargetAnchor <em>Target Anchor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getTargetAnchor <em>Target
+	 * Anchor</em>}' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * A target anchor is a routing constraint installed on edges to identify where the target
-	 * view should anchor that edge.	 
+	 * A target anchor is a routing constraint installed on edges to identify where
+	 * the target view should anchor that edge.
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Anchor</em>' containment reference.
+	 * 
+	 * @param value the new value of the '<em>Target Anchor</em>' containment
+	 *              reference.
 	 * @see #getTargetAnchor()
 	 * @generated
 	 */
 	void setTargetAnchor(Anchor value);
 
-    /**
+	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A utility method to create a <code>Bendpoints</code> object from the given <code>EClass</code>
-	 * and then sets the edge's <em>Bendpoints</em> property to the new object.
+	 * A utility method to create a <code>Bendpoints</code> object from the given
+	 * <code>EClass</code> and then sets the edge's <em>Bendpoints</em> property to
+	 * the new object.
 	 * </p>
 	 * 
-	 * @param eClass the <code>EClass</code> to be used in creating the <code>Bendpoints</code> object
-	 * <!-- end-user-doc -->
+	 * @param eClass the <code>EClass</code> to be used in creating the
+	 *               <code>Bendpoints</code> object <!-- end-user-doc -->
 	 * @model
 	 * @generated
 	 */
 	Bendpoints createBendpoints(EClass eClass);
 
-    /**
+	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A utility method to create an <code>Anchor</code> object from the given <code>EClass</code>
-	 * and then sets the edge's <em>SourceAnchor</em> property to the new object.
+	 * A utility method to create an <code>Anchor</code> object from the given
+	 * <code>EClass</code> and then sets the edge's <em>SourceAnchor</em> property
+	 * to the new object.
 	 * </p>
 	 * 
-	 * @param eClass the <code>EClass</code> to be used in creating the <code>Anchor</code> object
-	 * <!-- end-user-doc -->
+	 * @param eClass the <code>EClass</code> to be used in creating the
+	 *               <code>Anchor</code> object <!-- end-user-doc -->
 	 * @model
 	 * @generated
 	 */
 	Anchor createSourceAnchor(EClass eClass);
 
-    /**
+	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A utility method to create an <code>Anchor</code> object from the given <code>EClass</code>
-	 * and then sets the edge's <em>TargetAnchor</em> property to the new object.
+	 * A utility method to create an <code>Anchor</code> object from the given
+	 * <code>EClass</code> and then sets the edge's <em>TargetAnchor</em> property
+	 * to the new object.
 	 * </p>
 	 * 
-	 * @param eClass the <code>EClass</code> to be used in creating the <code>Anchor</code> object
-	 * <!-- end-user-doc -->
+	 * @param eClass the <code>EClass</code> to be used in creating the
+	 *               <code>Anchor</code> object <!-- end-user-doc -->
 	 * @model
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FillStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FillStyle.java
index 2bba37d..54e3329 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FillStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FillStyle.java
@@ -14,10 +14,9 @@
 
 import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Fill Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Fill
+ * Style</b></em>'.
  * <p>
  * The fill style is a style to specify the fill properties of a node
  * </p>
@@ -25,12 +24,15 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor <em>Fill Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FillStyle#getTransparency <em>Transparency</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FillStyle#getGradient <em>Gradient</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor <em>Fill
+ * Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FillStyle#getTransparency
+ * <em>Transparency</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FillStyle#getGradient
+ * <em>Gradient</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFillStyle()
  * @model
@@ -40,14 +42,14 @@
  * @canBeSeenBy %partners
  */
 public interface FillStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Fill Color</b></em>' attribute.
-	 * The default value is <code>"16777215"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Fill Color</b></em>' attribute. The default
+	 * value is <code>"16777215"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * The fill color is the color used in painting the background of node visuals
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Fill Color</em>' attribute.
 	 * @see #setFillColor(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFillStyle_FillColor()
@@ -56,28 +58,30 @@
 	 */
 	int getFillColor();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor <em>Fill Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor <em>Fill
+	 * Color</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The fill color is the color used in painting the background of node visuals
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Fill Color</em>' attribute.
 	 * @see #getFillColor()
 	 * @generated
 	 */
 	void setFillColor(int value);
 
-				/**
-	 * Returns the value of the '<em><b>Transparency</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Transparency</b></em>' attribute. The
+	 * default value is <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Transparency</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Transparency</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Transparency</em>' attribute.
 	 * @see #setTransparency(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFillStyle_Transparency()
@@ -86,24 +90,27 @@
 	 */
 	int getTransparency();
 
-				/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FillStyle#getTransparency <em>Transparency</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FillStyle#getTransparency
+	 * <em>Transparency</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>Transparency</em>' attribute.
 	 * @see #getTransparency()
 	 * @generated
 	 */
 	void setTransparency(int value);
 
-				/**
-	 * Returns the value of the '<em><b>Gradient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Gradient</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Gradient</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Gradient</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Gradient</em>' attribute.
 	 * @see #setGradient(GradientData)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFillStyle_Gradient()
@@ -112,10 +119,11 @@
 	 */
 	GradientData getGradient();
 
-				/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FillStyle#getGradient <em>Gradient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FillStyle#getGradient
+	 * <em>Gradient</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Gradient</em>' attribute.
 	 * @see #getGradient()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Filtering.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Filtering.java
index acd694b..21b6d02 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Filtering.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Filtering.java
@@ -19,10 +19,10 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Filtering</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Filtering</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFiltering()
  * @model
  * @generated
@@ -31,10 +31,10 @@
  * @canBeSeenBy %partners
  */
 public final class Filtering extends AbstractEnumerator {
-    /**
-	 * The '<em><b>None</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>None</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE_LITERAL
 	 * @model name="None"
 	 * @generated
@@ -42,10 +42,10 @@
 	 */
 	public static final int NONE = 0;
 
-    /**
-	 * The '<em><b>Manual</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Manual</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #MANUAL_LITERAL
 	 * @model name="Manual"
 	 * @generated
@@ -53,10 +53,10 @@
 	 */
 	public static final int MANUAL = 1;
 
-    /**
-	 * The '<em><b>Automatic</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Automatic</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #AUTOMATIC_LITERAL
 	 * @model name="Automatic"
 	 * @generated
@@ -64,61 +64,59 @@
 	 */
 	public static final int AUTOMATIC = 2;
 
-    /**
-	 * The '<em><b>None</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>None</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE
 	 * @generated
 	 * @ordered
 	 */
 	public static final Filtering NONE_LITERAL = new Filtering(NONE, "None", "None"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Manual</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Manual</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #MANUAL
 	 * @generated
 	 * @ordered
 	 */
 	public static final Filtering MANUAL_LITERAL = new Filtering(MANUAL, "Manual", "Manual"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Automatic</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Automatic</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #AUTOMATIC
 	 * @generated
 	 * @ordered
 	 */
 	public static final Filtering AUTOMATIC_LITERAL = new Filtering(AUTOMATIC, "Automatic", "Automatic"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Filtering</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Filtering</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final Filtering[] VALUES_ARRAY =
-        new Filtering[] {
-			NONE_LITERAL,
-			MANUAL_LITERAL,
-			AUTOMATIC_LITERAL,
-		};
+	private static final Filtering[] VALUES_ARRAY = new Filtering[] { NONE_LITERAL, MANUAL_LITERAL,
+			AUTOMATIC_LITERAL, };
 
-    /**
+	/**
 	 * A public read-only list of all the '<em><b>Filtering</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Filtering</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Filtering</b></em>' literal with the specified literal
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Filtering get(String literal) {
@@ -131,13 +129,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Filtering</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Filtering</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static Filtering getByName(String name) {
+	public static Filtering getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			Filtering result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -147,29 +147,34 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Filtering</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Filtering</b></em>' literal with the specified integer
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Filtering get(int value) {
 		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case MANUAL: return MANUAL_LITERAL;
-			case AUTOMATIC: return AUTOMATIC_LITERAL;
+		case NONE:
+			return NONE_LITERAL;
+		case MANUAL:
+			return MANUAL_LITERAL;
+		case AUTOMATIC:
+			return AUTOMATIC_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private Filtering(int value, String name, String literal) {
+	private Filtering(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //Filtering
+} // Filtering
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FilteringStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FilteringStyle.java
index 16fcc64..edfa196 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FilteringStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FilteringStyle.java
@@ -17,21 +17,25 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Filtering Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Filtering Style</b></em>'.
  * <p>
- * The filtering style is a style to be installed on nodes representing lists to be filtered
+ * The filtering style is a style to be installed on nodes representing lists to
+ * be filtered
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFiltering <em>Filtering</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteringKeys <em>Filtering Keys</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteredObjects <em>Filtered Objects</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFiltering
+ * <em>Filtering</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteringKeys
+ * <em>Filtering Keys</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteredObjects
+ * <em>Filtered Objects</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFilteringStyle()
  * @model
@@ -41,15 +45,15 @@
  * @canBeSeenBy %partners
  */
 public interface FilteringStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Filtering</b></em>' attribute.
-	 * The default value is <code>"None"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.Filtering}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Filtering</b></em>' attribute. The default
+	 * value is <code>"None"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.Filtering}. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the type of filtering applied to the list represented by the node
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Filtering</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Filtering
 	 * @see #setFiltering(Filtering)
@@ -59,13 +63,15 @@
 	 */
 	Filtering getFiltering();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFiltering <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFiltering
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the type of filtering applied to the list represented by the node
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Filtering</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Filtering
 	 * @see #getFiltering()
@@ -74,17 +80,20 @@
 	void setFiltering(Filtering value);
 
 	/**
-	 * Returns the value of the '<em><b>Filtering Keys</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Filtering Keys</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * The property is an unordered list of string keys to filter on. The keys string are user-defined and
-	 * normally used when the <em>Filtering</em> property is set to <em>Automatic</em>
+	 * The property is an unordered list of string keys to filter on. The keys
+	 * string are user-defined and normally used when the <em>Filtering</em>
+	 * property is set to <em>Automatic</em>
 	 * 
 	 * The value is a non-modifiable list of <code>java.lang.String</code> objects
-	 * Any attempt to change the returned list will result in <code>UnsupportedOperationException</code> thrown;
-	 * instead use <code>setFilteringKeys</code> to change the list
+	 * Any attempt to change the returned list will result in
+	 * <code>UnsupportedOperationException</code> thrown; instead use
+	 * <code>setFilteringKeys</code> to change the list
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Filtering Keys</em>' attribute.
 	 * @see #setFilteringKeys(List)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFilteringStyle_FilteringKeys()
@@ -94,32 +103,40 @@
 	List getFilteringKeys();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteringKeys <em>Filtering Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteringKeys
+	 * <em>Filtering Keys</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * The property is an unordered list of string keys to filter on. The keys string are user-defined and
-	 * normally used when the <em>Filtering</em> property is set to <em>Automatic</em>
+	 * The property is an unordered list of string keys to filter on. The keys
+	 * string are user-defined and normally used when the <em>Filtering</em>
+	 * property is set to <em>Automatic</em>
 	 * 
-	 * The value must be an empty list or one that contains only <code>java.lang.String</code> objects
+	 * The value must be an empty list or one that contains only
+	 * <code>java.lang.String</code> objects
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Filtering Keys</em>' attribute. The value cannot be <code>null</code>
+	 * 
+	 * @param value the new value of the '<em>Filtering Keys</em>' attribute. The
+	 *              value cannot be <code>null</code>
 	 * @see #getFilteringKeys()
-	 * @throws NullPointerException if the passed list is <code>null</code>
-	 * @throws IllegalArgumentException if one or more objects in the passed list is not of type <code>java.lang.String</code> 
+	 * @throws NullPointerException     if the passed list is <code>null</code>
+	 * @throws IllegalArgumentException if one or more objects in the passed list is
+	 *                                  not of type <code>java.lang.String</code>
 	 * @generated NOT
 	 */
 	void setFilteringKeys(List value);
 
-    /**
+	/**
 	 * Returns the value of the '<em><b>Filtered Objects</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
-	 * <!-- begin-user-doc -->
+	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * The property is an unordered list of references to objects be filtered. The property is
-	 * normally used when the <em>Filtering</em> property is set to <em>Manual</em>
+	 * The property is an unordered list of references to objects be filtered. The
+	 * property is normally used when the <em>Filtering</em> property is set to
+	 * <em>Manual</em>
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Filtered Objects</em>' reference list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFilteringStyle_FilteredObjects()
 	 * @model type="org.eclipse.emf.ecore.EObject"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FontStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FontStyle.java
index 85c12c4..8863c10 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FontStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/FontStyle.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Font Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Font
+ * Style</b></em>'.
  * <p>
  * The font style is a style to be installed on views with text
  * </p>
@@ -23,16 +22,23 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontColor <em>Font Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontName <em>Font Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontHeight <em>Font Height</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#isBold <em>Bold</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#isItalic <em>Italic</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#isUnderline <em>Underline</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#isStrikeThrough <em>Strike Through</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontColor <em>Font
+ * Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontName <em>Font
+ * Name</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontHeight <em>Font
+ * Height</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#isBold
+ * <em>Bold</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#isItalic
+ * <em>Italic</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#isUnderline
+ * <em>Underline</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#isStrikeThrough
+ * <em>Strike Through</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFontStyle()
  * @model
@@ -42,14 +48,14 @@
  * @canBeSeenBy %partners
  */
 public interface FontStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Font Name</b></em>' attribute.
-	 * The default value is <code>"Tahoma"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Font Name</b></em>' attribute. The default
+	 * value is <code>"Tahoma"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * The fontName property specified the font typeface name
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Font Name</em>' attribute.
 	 * @see #setFontName(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFontStyle_FontName()
@@ -58,27 +64,29 @@
 	 */
 	String getFontName();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontName <em>Font Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontName <em>Font
+	 * Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The fontName property specifies the font typeface name
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Font Name</em>' attribute.
 	 * @see #getFontName()
 	 * @generated
 	 */
 	void setFontName(String value);
 
-    /**
-	 * Returns the value of the '<em><b>Font Height</b></em>' attribute.
-	 * The default value is <code>"9"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Font Height</b></em>' attribute. The default
+	 * value is <code>"9"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * The fontHeight property specifies the font size
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Font Height</em>' attribute.
 	 * @see #setFontHeight(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFontStyle_FontHeight()
@@ -87,22 +95,22 @@
 	 */
 	int getFontHeight();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontHeight <em>Font Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * The fontHeight property specifies the font size
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontHeight <em>Font
+	 * Height</em>}' attribute. <!-- begin-user-doc --> The fontHeight property
+	 * specifies the font size <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Font Height</em>' attribute.
 	 * @see #getFontHeight()
 	 * @generated
 	 */
 	void setFontHeight(int value);
 
-    /**
-	 * Returns the value of the '<em><b>Bold</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Bold</b></em>' attribute. The default value
+	 * is <code>"false"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Bold</em>' attribute.
 	 * @see #setBold(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFontStyle_Bold()
@@ -111,21 +119,21 @@
 	 */
 	boolean isBold();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FontStyle#isBold <em>Bold</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#isBold <em>Bold</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Bold</em>' attribute.
 	 * @see #isBold()
 	 * @generated
 	 */
 	void setBold(boolean value);
 
-    /**
-	 * Returns the value of the '<em><b>Italic</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Italic</b></em>' attribute. The default
+	 * value is <code>"false"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Italic</em>' attribute.
 	 * @see #setItalic(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFontStyle_Italic()
@@ -134,21 +142,21 @@
 	 */
 	boolean isItalic();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FontStyle#isItalic <em>Italic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#isItalic <em>Italic</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Italic</em>' attribute.
 	 * @see #isItalic()
 	 * @generated
 	 */
 	void setItalic(boolean value);
 
-    /**
-	 * Returns the value of the '<em><b>Underline</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Underline</b></em>' attribute. The default
+	 * value is <code>"false"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Underline</em>' attribute.
 	 * @see #setUnderline(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFontStyle_Underline()
@@ -157,21 +165,22 @@
 	 */
 	boolean isUnderline();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FontStyle#isUnderline <em>Underline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#isUnderline
+	 * <em>Underline</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Underline</em>' attribute.
 	 * @see #isUnderline()
 	 * @generated
 	 */
 	void setUnderline(boolean value);
 
-    /**
-	 * Returns the value of the '<em><b>Strike Through</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Strike Through</b></em>' attribute. The
+	 * default value is <code>"false"</code>. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strike Through</em>' attribute.
 	 * @see #setStrikeThrough(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFontStyle_StrikeThrough()
@@ -180,24 +189,25 @@
 	 */
 	boolean isStrikeThrough();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FontStyle#isStrikeThrough <em>Strike Through</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#isStrikeThrough <em>Strike
+	 * Through</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Strike Through</em>' attribute.
 	 * @see #isStrikeThrough()
 	 * @generated
 	 */
 	void setStrikeThrough(boolean value);
 
-    /**
-	 * Returns the value of the '<em><b>Font Color</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Font Color</b></em>' attribute. The default
+	 * value is <code>"0"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * The font color is the color used in painting the texts inside node visuals
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Font Color</em>' attribute.
 	 * @see #setFontColor(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getFontStyle_FontColor()
@@ -206,13 +216,15 @@
 	 */
 	int getFontColor();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontColor <em>Font Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontColor <em>Font
+	 * Color</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The font color is the color used in painting the texts inside node visuals
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Font Color</em>' attribute.
 	 * @see #getFontColor()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GradientStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GradientStyle.java
index 640bb93..ce8b260 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GradientStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GradientStyle.java
@@ -18,23 +18,23 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Gradient Style</b></em>',
- * and utility methods for working with them.
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Gradient Style</b></em>', and utility methods for working with them.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGradientStyle()
  * @model
  * @generated
  */
 public final class GradientStyle extends AbstractEnumerator {
 	/**
-	 * The '<em><b>Vertical</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Vertical</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Vertical</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #VERTICAL_LITERAL
 	 * @model name="Vertical"
 	 * @generated
@@ -43,13 +43,13 @@
 	public static final int VERTICAL = 0;
 
 	/**
-	 * The '<em><b>Horizontal</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Horizontal</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Horizontal</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #HORIZONTAL_LITERAL
 	 * @model name="Horizontal"
 	 * @generated
@@ -58,9 +58,9 @@
 	public static final int HORIZONTAL = 1;
 
 	/**
-	 * The '<em><b>Vertical</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Vertical</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #VERTICAL
 	 * @generated
 	 * @ordered
@@ -68,9 +68,9 @@
 	public static final GradientStyle VERTICAL_LITERAL = new GradientStyle(VERTICAL, "Vertical", "Vertical"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Horizontal</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Horizontal</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #HORIZONTAL
 	 * @generated
 	 * @ordered
@@ -78,29 +78,27 @@
 	public static final GradientStyle HORIZONTAL_LITERAL = new GradientStyle(HORIZONTAL, "Horizontal", "Horizontal"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * An array of all the '<em><b>Gradient Style</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Gradient Style</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final GradientStyle[] VALUES_ARRAY =
-		new GradientStyle[] {
-			VERTICAL_LITERAL,
-			HORIZONTAL_LITERAL,
-		};
+	private static final GradientStyle[] VALUES_ARRAY = new GradientStyle[] { VERTICAL_LITERAL, HORIZONTAL_LITERAL, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Gradient Style</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Gradient Style</b></em>'
+	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Gradient Style</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Gradient Style</b></em>' literal with the specified
+	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GradientStyle get(String literal) {
@@ -115,8 +113,10 @@
 
 	/**
 	 * Returns the '<em><b>Gradient Style</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GradientStyle getByName(String name) {
@@ -130,27 +130,31 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Gradient Style</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Gradient Style</b></em>' literal with the specified
+	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GradientStyle get(int value) {
 		switch (value) {
-			case VERTICAL: return VERTICAL_LITERAL;
-			case HORIZONTAL: return HORIZONTAL_LITERAL;
+		case VERTICAL:
+			return VERTICAL_LITERAL;
+		case HORIZONTAL:
+			return HORIZONTAL_LITERAL;
 		}
 		return null;
 	}
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private GradientStyle(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //GradientStyle
+} // GradientStyle
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Guide.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Guide.java
index 743e705..f4403ca 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Guide.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Guide.java
@@ -16,22 +16,24 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Guide</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Guide</b></em>'.
  * <p>
- * A guide is a constraint on the x-y layout of nodes. A guide is defined by a position along 
- * one the of the diagram rulers. Nodes attached to a guide can be attached by a varierty
- * of alignments
+ * A guide is a constraint on the x-y layout of nodes. A guide is defined by a
+ * position along one the of the diagram rulers. Nodes attached to a guide can
+ * be attached by a varierty of alignments
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Guide#getPosition <em>Position</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Guide#getNodeMap <em>Node Map</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Guide#getPosition
+ * <em>Position</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Guide#getNodeMap <em>Node
+ * Map</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGuide()
  * @model
@@ -41,14 +43,14 @@
  * @canBeSeenBy %partners
  */
 public interface Guide extends EObject {
-    /**
-	 * Returns the value of the '<em><b>Position</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Position</b></em>' attribute. The default
+	 * value is <code>"0"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * The position is the distance along the diagram ruler of the guide
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Position</em>' attribute.
 	 * @see #setPosition(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGuide_Position()
@@ -57,31 +59,36 @@
 	 */
 	int getPosition();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Guide#getPosition <em>Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Guide#getPosition
+	 * <em>Position</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The position is the distance along the diagram ruler of the guide
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Position</em>' attribute.
 	 * @see #getPosition()
 	 * @generated
 	 */
 	void setPosition(int value);
 
-    /**
-	 * Returns the value of the '<em><b>Node Map</b></em>' map.
-	 * The key is of type {@link org.eclipse.gmf.runtime.notation.Node},
-	 * and the value is of type {@link org.eclipse.gmf.runtime.notation.Alignment},
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Node Map</b></em>' map. The key is of type
+	 * {@link org.eclipse.gmf.runtime.notation.Node}, and the value is of type
+	 * {@link org.eclipse.gmf.runtime.notation.Alignment}, <!-- begin-user-doc -->
 	 * <p>
-	 * The map is an unordered map from nodes to their alignment in respect to the guide.
+	 * The map is an unordered map from nodes to their alignment in respect to the
+	 * guide.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Node Map</em>' map.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGuide_NodeMap()
-	 * @model mapType="org.eclipse.gmf.runtime.notation.NodeEntry" keyType="org.eclipse.gmf.runtime.notation.Node" valueType="org.eclipse.gmf.runtime.notation.Alignment"
+	 * @model mapType="org.eclipse.gmf.runtime.notation.NodeEntry"
+	 *        keyType="org.eclipse.gmf.runtime.notation.Node"
+	 *        valueType="org.eclipse.gmf.runtime.notation.Alignment"
 	 * @generated
 	 */
 	EMap getNodeMap();
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GuideStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GuideStyle.java
index 9b14db2..b8235eb 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GuideStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GuideStyle.java
@@ -15,20 +15,23 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Guide Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Guide
+ * Style</b></em>'.
  * <p>
- * The guide style is a style to be installed on diagrams that support rulers/guides
+ * The guide style is a style to be installed on diagrams that support
+ * rulers/guides
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.GuideStyle#getHorizontalGuides <em>Horizontal Guides</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.GuideStyle#getVerticalGuides <em>Vertical Guides</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.GuideStyle#getHorizontalGuides
+ * <em>Horizontal Guides</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.GuideStyle#getVerticalGuides
+ * <em>Vertical Guides</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGuideStyle()
  * @model
@@ -38,30 +41,34 @@
  * @canBeSeenBy %partners
  */
 public interface GuideStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Horizontal Guides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Guide}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Horizontal Guides</b></em>' containment
+	 * reference list. The list contents are of type
+	 * {@link org.eclipse.gmf.runtime.notation.Guide}. <!-- begin-user-doc -->
 	 * <p>
 	 * These are the guides along the horizontal ruler of the diagram
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Horizontal Guides</em>' containment reference list.
+	 * 
+	 * @return the value of the '<em>Horizontal Guides</em>' containment reference
+	 *         list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGuideStyle_HorizontalGuides()
 	 * @model type="org.eclipse.gmf.runtime.notation.Guide" containment="true"
 	 * @generated
 	 */
 	EList getHorizontalGuides();
 
-    /**
-	 * Returns the value of the '<em><b>Vertical Guides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Guide}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Vertical Guides</b></em>' containment
+	 * reference list. The list contents are of type
+	 * {@link org.eclipse.gmf.runtime.notation.Guide}. <!-- begin-user-doc -->
 	 * <p>
 	 * These are the guides along the vertical ruler of the diagram
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Vertical Guides</em>' containment reference list.
+	 * 
+	 * @return the value of the '<em>Vertical Guides</em>' containment reference
+	 *         list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGuideStyle_VerticalGuides()
 	 * @model type="org.eclipse.gmf.runtime.notation.Guide" containment="true"
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/HintedDiagramLinkStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/HintedDiagramLinkStyle.java
index 46a455f..a8d8fbc 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/HintedDiagramLinkStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/HintedDiagramLinkStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Hinted Diagram Link Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Hinted
+ * Diagram Link Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle#getHint <em>Hint</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle#getHint
+ * <em>Hint</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getHintedDiagramLinkStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface HintedDiagramLinkStyle extends DiagramLinkStyle, Style {
 	/**
-	 * Returns the value of the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hint</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hint</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hint</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hint</em>' attribute.
 	 * @see #setHint(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getHintedDiagramLinkStyle_Hint()
@@ -46,9 +46,10 @@
 	String getHint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle#getHint <em>Hint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle#getHint
+	 * <em>Hint</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Hint</em>' attribute.
 	 * @see #getHint()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IdentityAnchor.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IdentityAnchor.java
index 38b7640..8fabe6c 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IdentityAnchor.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IdentityAnchor.java
@@ -12,21 +12,22 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Identity Anchor</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Identity
+ * Anchor</b></em>'.
  * <p>
- * The identity anchor is an anchor constraint which has a unique string id within its defining view
+ * The identity anchor is an anchor constraint which has a unique string id
+ * within its defining view
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.IdentityAnchor#getId <em>Id</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.IdentityAnchor#getId
+ * <em>Id</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getIdentityAnchor()
  * @model
@@ -36,14 +37,14 @@
  * @canBeSeenBy %partners
  */
 public interface IdentityAnchor extends Anchor {
-    /**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * The default value is <code>"anchor"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Id</b></em>' attribute. The default value is
+	 * <code>"anchor"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * The id is user-define
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getIdentityAnchor_Id()
@@ -52,13 +53,15 @@
 	 */
 	String getId();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.IdentityAnchor#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.IdentityAnchor#getId <em>Id</em>}'
+	 * attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The id is user-define
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Image.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Image.java
index 4ee54aa..6d78650 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Image.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Image.java
@@ -15,8 +15,8 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Image</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Image</b></em>'.
  * <p>
  * An image is representing a serialization of an image file
  * </p>
@@ -24,10 +24,10 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Image#getData <em>Data</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Image#getData <em>Data</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getImage()
  * @model
@@ -37,14 +37,16 @@
  * @canBeSeenBy %partners
  */
 public interface Image extends EObject {
-    /**
-	 * Returns the value of the '<em><b>Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Data</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * The data is a blop representing the image data. The returned <code>byte[]</code> is not
-	 * expected to be changed. If a change is requried, it has to be through the <code>setData()</code> API
+	 * The data is a blop representing the image data. The returned
+	 * <code>byte[]</code> is not expected to be changed. If a change is requried,
+	 * it has to be through the <code>setData()</code> API
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Data</em>' attribute.
 	 * @see #setData(byte[])
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getImage_Data()
@@ -53,13 +55,14 @@
 	 */
 	byte[] getData();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Image#getData <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Image#getData
+	 * <em>Data</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The data is a blop representing the image data.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Data</em>' attribute.
 	 * @see #getData()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ImageBufferStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ImageBufferStyle.java
index 0bd4ca3..981c413 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ImageBufferStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ImageBufferStyle.java
@@ -12,18 +12,17 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Image Buffer Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Image
+ * Buffer Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle#getImageBuffer <em>Image Buffer</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle#getImageBuffer
+ * <em>Image Buffer</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getImageBufferStyle()
  * @model
@@ -33,14 +32,15 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public interface ImageBufferStyle extends ImageStyle {
-    /**
-	 * Returns the value of the '<em><b>Image Buffer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Image Buffer</b></em>' containment
+	 * reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Image Buffer</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Image Buffer</em>' containment reference isn't
+	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Image Buffer</em>' containment reference.
 	 * @see #setImageBuffer(Image)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getImageBufferStyle_ImageBuffer()
@@ -49,11 +49,14 @@
 	 */
 	Image getImageBuffer();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle#getImageBuffer <em>Image Buffer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Image Buffer</em>' containment reference.
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle#getImageBuffer
+	 * <em>Image Buffer</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Image Buffer</em>' containment
+	 *              reference.
 	 * @see #getImageBuffer()
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ImageStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ImageStyle.java
index acb7e8d..8c69500 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ImageStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ImageStyle.java
@@ -12,20 +12,21 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Image Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Image
+ * Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.ImageStyle#getAntiAlias <em>Anti Alias</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.ImageStyle#getMaintainAspectRatio <em>Maintain Aspect Ratio</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.ImageStyle#getCropBound <em>Crop Bound</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.ImageStyle#getAntiAlias <em>Anti
+ * Alias</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.ImageStyle#getMaintainAspectRatio
+ * <em>Maintain Aspect Ratio</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.ImageStyle#getCropBound <em>Crop
+ * Bound</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getImageStyle()
  * @model
@@ -35,15 +36,15 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public interface ImageStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Anti Alias</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Anti Alias</b></em>' attribute. The default
+	 * value is <code>"true"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Anti Alias</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Anti Alias</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Anti Alias</em>' attribute.
 	 * @see #setAntiAlias(Boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getImageStyle_AntiAlias()
@@ -53,9 +54,10 @@
 	Boolean getAntiAlias();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getAntiAlias <em>Anti Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getAntiAlias <em>Anti
+	 * Alias</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Anti Alias</em>' attribute.
 	 * @see #getAntiAlias()
 	 * @generated
@@ -64,13 +66,13 @@
 
 	/**
 	 * Returns the value of the '<em><b>Maintain Aspect Ratio</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
+	 * The default value is <code>"true"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Maintain Aspect Ratio</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Maintain Aspect Ratio</em>' attribute.
 	 * @see #setMaintainAspectRatio(Boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getImageStyle_MaintainAspectRatio()
@@ -80,23 +82,26 @@
 	Boolean getMaintainAspectRatio();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getMaintainAspectRatio <em>Maintain Aspect Ratio</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getMaintainAspectRatio
+	 * <em>Maintain Aspect Ratio</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Maintain Aspect Ratio</em>' attribute.
 	 * @see #getMaintainAspectRatio()
 	 * @generated
 	 */
 	void setMaintainAspectRatio(Boolean value);
 
-				/**
+	/**
 	 * Returns the value of the '<em><b>Crop Bound</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Crop Bound</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Crop Bound</em>' containment reference isn't
+	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Crop Bound</em>' containment reference.
 	 * @see #setCropBound(Bounds)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getImageStyle_CropBound()
@@ -105,11 +110,14 @@
 	 */
 	Bounds getCropBound();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getCropBound <em>Crop Bound</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Crop Bound</em>' containment reference.
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getCropBound <em>Crop
+	 * Bound</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param value the new value of the '<em>Crop Bound</em>' containment
+	 *              reference.
 	 * @see #getCropBound()
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IntListValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IntListValueStyle.java
index 6fcd4ef..e5eecf2 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IntListValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IntListValueStyle.java
@@ -14,16 +14,16 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Int List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Int List
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.IntListValueStyle#getIntListValue <em>Int List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.IntListValueStyle#getIntListValue
+ * <em>Int List Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getIntListValueStyle()
  * @model
@@ -31,14 +31,14 @@
  */
 public interface IntListValueStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>Int List Value</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.Integer}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Int List Value</b></em>' attribute list. The
+	 * list contents are of type {@link java.lang.Integer}. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Int List Value</em>' attribute list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Int List Value</em>' attribute list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getIntListValueStyle_IntListValue()
 	 * @model unique="false"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IntValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IntValueStyle.java
index 0a3fe53..a4314ce 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IntValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/IntValueStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Int Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Int
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.IntValueStyle#getIntValue <em>Int Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.IntValueStyle#getIntValue <em>Int
+ * Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getIntValueStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface IntValueStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>Int Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Int Value</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Int Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Int Value</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Int Value</em>' attribute.
 	 * @see #setIntValue(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getIntValueStyle_IntValue()
@@ -46,9 +46,10 @@
 	int getIntValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.IntValueStyle#getIntValue <em>Int Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.IntValueStyle#getIntValue <em>Int
+	 * Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Int Value</em>' attribute.
 	 * @see #getIntValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/JumpLinkStatus.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/JumpLinkStatus.java
index f5bb689..958dab5 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/JumpLinkStatus.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/JumpLinkStatus.java
@@ -19,10 +19,10 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Jump Link Status</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Jump Link Status</b></em>', and utility methods for working with
+ * them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getJumpLinkStatus()
  * @model
  * @generated
@@ -31,10 +31,10 @@
  * @canBeSeenBy %partners
  */
 public final class JumpLinkStatus extends AbstractEnumerator {
-    /**
-	 * The '<em><b>None</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>None</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE_LITERAL
 	 * @model name="None"
 	 * @generated
@@ -42,10 +42,10 @@
 	 */
 	public static final int NONE = 0;
 
-    /**
-	 * The '<em><b>All</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>All</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #ALL_LITERAL
 	 * @model name="All"
 	 * @generated
@@ -53,10 +53,10 @@
 	 */
 	public static final int ALL = 1;
 
-    /**
-	 * The '<em><b>Below</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Below</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #BELOW_LITERAL
 	 * @model name="Below"
 	 * @generated
@@ -64,10 +64,10 @@
 	 */
 	public static final int BELOW = 2;
 
-    /**
-	 * The '<em><b>Above</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Above</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #ABOVE_LITERAL
 	 * @model name="Above"
 	 * @generated
@@ -75,72 +75,69 @@
 	 */
 	public static final int ABOVE = 3;
 
-    /**
-	 * The '<em><b>None</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>None</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE
 	 * @generated
 	 * @ordered
 	 */
 	public static final JumpLinkStatus NONE_LITERAL = new JumpLinkStatus(NONE, "None", "None"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>All</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>All</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #ALL
 	 * @generated
 	 * @ordered
 	 */
 	public static final JumpLinkStatus ALL_LITERAL = new JumpLinkStatus(ALL, "All", "All"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Below</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Below</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #BELOW
 	 * @generated
 	 * @ordered
 	 */
 	public static final JumpLinkStatus BELOW_LITERAL = new JumpLinkStatus(BELOW, "Below", "Below"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Above</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Above</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #ABOVE
 	 * @generated
 	 * @ordered
 	 */
 	public static final JumpLinkStatus ABOVE_LITERAL = new JumpLinkStatus(ABOVE, "Above", "Above"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Jump Link Status</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Jump Link Status</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final JumpLinkStatus[] VALUES_ARRAY =
-        new JumpLinkStatus[] {
-			NONE_LITERAL,
-			ALL_LITERAL,
-			BELOW_LITERAL,
-			ABOVE_LITERAL,
-		};
+	private static final JumpLinkStatus[] VALUES_ARRAY = new JumpLinkStatus[] { NONE_LITERAL, ALL_LITERAL,
+			BELOW_LITERAL, ABOVE_LITERAL, };
 
-    /**
-	 * A public read-only list of all the '<em><b>Jump Link Status</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * A public read-only list of all the '<em><b>Jump Link Status</b></em>'
+	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Jump Link Status</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Jump Link Status</b></em>' literal with the specified
+	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static JumpLinkStatus get(String literal) {
@@ -153,13 +150,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Jump Link Status</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Jump Link Status</b></em>' literal with the specified
+	 * name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static JumpLinkStatus getByName(String name) {
+	public static JumpLinkStatus getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			JumpLinkStatus result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -169,30 +168,36 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Jump Link Status</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Jump Link Status</b></em>' literal with the specified
+	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static JumpLinkStatus get(int value) {
 		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case ALL: return ALL_LITERAL;
-			case BELOW: return BELOW_LITERAL;
-			case ABOVE: return ABOVE_LITERAL;
+		case NONE:
+			return NONE_LITERAL;
+		case ALL:
+			return ALL_LITERAL;
+		case BELOW:
+			return BELOW_LITERAL;
+		case ABOVE:
+			return ABOVE_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private JumpLinkStatus(int value, String name, String literal) {
+	private JumpLinkStatus(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //JumpLinkStatus
+} // JumpLinkStatus
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/JumpLinkType.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/JumpLinkType.java
index 312b8eb..be68841 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/JumpLinkType.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/JumpLinkType.java
@@ -19,10 +19,10 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Jump Link Type</b></em>',
- * and utility methods for working with them.
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Jump Link Type</b></em>', and utility methods for working with them.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getJumpLinkType()
  * @model
  * @generated
@@ -31,10 +31,10 @@
  * @canBeSeenBy %partners
  */
 public final class JumpLinkType extends AbstractEnumerator {
-    /**
-	 * The '<em><b>Semicircle</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Semicircle</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #SEMICIRCLE_LITERAL
 	 * @model name="Semicircle"
 	 * @generated
@@ -42,10 +42,10 @@
 	 */
 	public static final int SEMICIRCLE = 0;
 
-    /**
-	 * The '<em><b>Square</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Square</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #SQUARE_LITERAL
 	 * @model name="Square"
 	 * @generated
@@ -53,10 +53,10 @@
 	 */
 	public static final int SQUARE = 1;
 
-    /**
-	 * The '<em><b>Chamfered</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Chamfered</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #CHAMFERED_LITERAL
 	 * @model name="Chamfered"
 	 * @generated
@@ -64,61 +64,59 @@
 	 */
 	public static final int CHAMFERED = 2;
 
-    /**
-	 * The '<em><b>Semicircle</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Semicircle</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #SEMICIRCLE
 	 * @generated
 	 * @ordered
 	 */
 	public static final JumpLinkType SEMICIRCLE_LITERAL = new JumpLinkType(SEMICIRCLE, "Semicircle", "Semicircle"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Square</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Square</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #SQUARE
 	 * @generated
 	 * @ordered
 	 */
 	public static final JumpLinkType SQUARE_LITERAL = new JumpLinkType(SQUARE, "Square", "Square"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Chamfered</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Chamfered</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #CHAMFERED
 	 * @generated
 	 * @ordered
 	 */
 	public static final JumpLinkType CHAMFERED_LITERAL = new JumpLinkType(CHAMFERED, "Chamfered", "Chamfered"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Jump Link Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Jump Link Type</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final JumpLinkType[] VALUES_ARRAY =
-        new JumpLinkType[] {
-			SEMICIRCLE_LITERAL,
-			SQUARE_LITERAL,
-			CHAMFERED_LITERAL,
-		};
+	private static final JumpLinkType[] VALUES_ARRAY = new JumpLinkType[] { SEMICIRCLE_LITERAL, SQUARE_LITERAL,
+			CHAMFERED_LITERAL, };
 
-    /**
-	 * A public read-only list of all the '<em><b>Jump Link Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * A public read-only list of all the '<em><b>Jump Link Type</b></em>'
+	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Jump Link Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Jump Link Type</b></em>' literal with the specified
+	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static JumpLinkType get(String literal) {
@@ -131,13 +129,15 @@
 		return null;
 	}
 
-    /**
+	/**
 	 * Returns the '<em><b>Jump Link Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static JumpLinkType getByName(String name) {
+	public static JumpLinkType getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			JumpLinkType result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -147,29 +147,34 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Jump Link Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Jump Link Type</b></em>' literal with the specified
+	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static JumpLinkType get(int value) {
 		switch (value) {
-			case SEMICIRCLE: return SEMICIRCLE_LITERAL;
-			case SQUARE: return SQUARE_LITERAL;
-			case CHAMFERED: return CHAMFERED_LITERAL;
+		case SEMICIRCLE:
+			return SEMICIRCLE_LITERAL;
+		case SQUARE:
+			return SQUARE_LITERAL;
+		case CHAMFERED:
+			return CHAMFERED_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private JumpLinkType(int value, String name, String literal) {
+	private JumpLinkType(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //JumpLinkType
+} // JumpLinkType
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LayoutConstraint.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LayoutConstraint.java
index 527a841..311647a 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LayoutConstraint.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LayoutConstraint.java
@@ -15,10 +15,10 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Layout Constraint</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Layout
+ * Constraint</b></em>'.
  * <p>
- * Layout constraints are installed on nodes and used by layout managers to 
+ * Layout constraints are installed on nodes and used by layout managers to
  * properly set the bounds of node's visuals
  * </p>
  * <!-- end-user-doc -->
@@ -31,6 +31,6 @@
 /*
  * @canBeSeenBy %partners
  */
-public interface LayoutConstraint extends EObject{
+public interface LayoutConstraint extends EObject {
 	// no default API
 } // LayoutConstraint
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineStyle.java
index eb455ff..077c427 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineStyle.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Line Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Line
+ * Style</b></em>'.
  * <p>
  * The line style is a style to be installed on views with lines
  * </p>
@@ -23,11 +22,13 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineColor <em>Line Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineWidth <em>Line Width</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineColor <em>Line
+ * Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineWidth <em>Line
+ * Width</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getLineStyle()
  * @model
@@ -37,14 +38,15 @@
  * @canBeSeenBy %partners
  */
 public interface LineStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Line Color</b></em>' attribute.
-	 * The default value is <code>"11579568"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Line Color</b></em>' attribute. The default
+	 * value is <code>"11579568"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * The line color is the color used in painting the lines (or foreground) of node visuals
+	 * The line color is the color used in painting the lines (or foreground) of
+	 * node visuals
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Line Color</em>' attribute.
 	 * @see #setLineColor(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getLineStyle_LineColor()
@@ -53,28 +55,31 @@
 	 */
 	int getLineColor();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineColor <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineColor <em>Line
+	 * Color</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * The line color is the color used in painting the lines (or foreground) of node visuals
+	 * The line color is the color used in painting the lines (or foreground) of
+	 * node visuals
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Line Color</em>' attribute.
 	 * @see #getLineColor()
 	 * @generated
 	 */
 	void setLineColor(int value);
 
-				/**
-	 * Returns the value of the '<em><b>Line Width</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Line Width</b></em>' attribute. The default
+	 * value is <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Line Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Line Width</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Line Width</em>' attribute.
 	 * @see #setLineWidth(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getLineStyle_LineWidth()
@@ -83,10 +88,11 @@
 	 */
 	int getLineWidth();
 
-				/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineWidth <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineWidth <em>Line
+	 * Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Line Width</em>' attribute.
 	 * @see #getLineWidth()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineType.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineType.java
index c32bc44..cea9a86 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineType.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineType.java
@@ -18,23 +18,23 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Line Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Line Type</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getLineType()
  * @model
  * @generated
  */
 public final class LineType extends AbstractEnumerator {
 	/**
-	 * The '<em><b>Solid</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Solid</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Solid</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Solid</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SOLID_LITERAL
 	 * @model name="Solid"
 	 * @generated
@@ -43,13 +43,13 @@
 	public static final int SOLID = 0;
 
 	/**
-	 * The '<em><b>Dash</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Dash</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Dash</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Dash</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DASH_LITERAL
 	 * @model name="Dash"
 	 * @generated
@@ -58,13 +58,13 @@
 	public static final int DASH = 1;
 
 	/**
-	 * The '<em><b>Dot</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Dot</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Dot</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Dot</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DOT_LITERAL
 	 * @model name="Dot"
 	 * @generated
@@ -73,13 +73,13 @@
 	public static final int DOT = 2;
 
 	/**
-	 * The '<em><b>Dash Dot</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Dash Dot</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Dash Dot</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DASH_DOT_LITERAL
 	 * @model name="DashDot"
 	 * @generated
@@ -88,13 +88,13 @@
 	public static final int DASH_DOT = 3;
 
 	/**
-	 * The '<em><b>Dash Dot Dot</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Dash Dot Dot</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Dash Dot Dot</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DASH_DOT_DOT_LITERAL
 	 * @model name="DashDotDot"
 	 * @generated
@@ -103,13 +103,13 @@
 	public static final int DASH_DOT_DOT = 4;
 
 	/**
-	 * The '<em><b>Double</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Double</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Double</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Double</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DOUBLE_LITERAL
 	 * @model name="Double"
 	 * @generated
@@ -118,9 +118,9 @@
 	public static final int DOUBLE = 5;
 
 	/**
-	 * The '<em><b>Solid</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Solid</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #SOLID
 	 * @generated
 	 * @ordered
@@ -128,9 +128,9 @@
 	public static final LineType SOLID_LITERAL = new LineType(SOLID, "Solid", "Solid"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Dash</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Dash</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #DASH
 	 * @generated
 	 * @ordered
@@ -138,9 +138,9 @@
 	public static final LineType DASH_LITERAL = new LineType(DASH, "Dash", "Dash"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Dot</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Dot</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #DOT
 	 * @generated
 	 * @ordered
@@ -148,9 +148,9 @@
 	public static final LineType DOT_LITERAL = new LineType(DOT, "Dot", "Dot"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Dash Dot</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Dash Dot</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #DASH_DOT
 	 * @generated
 	 * @ordered
@@ -158,9 +158,9 @@
 	public static final LineType DASH_DOT_LITERAL = new LineType(DASH_DOT, "DashDot", "DashDot"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Dash Dot Dot</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Dash Dot Dot</b></em>' literal object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DASH_DOT_DOT
 	 * @generated
 	 * @ordered
@@ -168,9 +168,9 @@
 	public static final LineType DASH_DOT_DOT_LITERAL = new LineType(DASH_DOT_DOT, "DashDotDot", "DashDotDot"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Double</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Double</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #DOUBLE
 	 * @generated
 	 * @ordered
@@ -178,33 +178,28 @@
 	public static final LineType DOUBLE_LITERAL = new LineType(DOUBLE, "Double", "Double"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * An array of all the '<em><b>Line Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Line Type</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final LineType[] VALUES_ARRAY =
-		new LineType[] {
-			SOLID_LITERAL,
-			DASH_LITERAL,
-			DOT_LITERAL,
-			DASH_DOT_LITERAL,
-			DASH_DOT_DOT_LITERAL,
-			DOUBLE_LITERAL,
-		};
+	private static final LineType[] VALUES_ARRAY = new LineType[] { SOLID_LITERAL, DASH_LITERAL, DOT_LITERAL,
+			DASH_DOT_LITERAL, DASH_DOT_DOT_LITERAL, DOUBLE_LITERAL, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Line Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Line Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Line Type</b></em>' literal with the specified literal
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static LineType get(String literal) {
@@ -218,9 +213,11 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Line Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Line Type</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static LineType getByName(String name) {
@@ -234,31 +231,39 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Line Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Line Type</b></em>' literal with the specified integer
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static LineType get(int value) {
 		switch (value) {
-			case SOLID: return SOLID_LITERAL;
-			case DASH: return DASH_LITERAL;
-			case DOT: return DOT_LITERAL;
-			case DASH_DOT: return DASH_DOT_LITERAL;
-			case DASH_DOT_DOT: return DASH_DOT_DOT_LITERAL;
-			case DOUBLE: return DOUBLE_LITERAL;
+		case SOLID:
+			return SOLID_LITERAL;
+		case DASH:
+			return DASH_LITERAL;
+		case DOT:
+			return DOT_LITERAL;
+		case DASH_DOT:
+			return DASH_DOT_LITERAL;
+		case DASH_DOT_DOT:
+			return DASH_DOT_DOT_LITERAL;
+		case DOUBLE:
+			return DOUBLE_LITERAL;
 		}
 		return null;
 	}
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private LineType(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //LineType
+} // LineType
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineTypeStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineTypeStyle.java
index 1b8f418..6190e6f 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineTypeStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/LineTypeStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Line Type Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Line
+ * Type Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.LineTypeStyle#getLineType <em>Line Type</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.LineTypeStyle#getLineType
+ * <em>Line Type</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getLineTypeStyle()
  * @model
@@ -30,15 +29,15 @@
  */
 public interface LineTypeStyle extends Style {
 	/**
-	 * Returns the value of the '<em><b>Line Type</b></em>' attribute.
-	 * The default value is <code>"Solid"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.LineType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Line Type</b></em>' attribute. The default
+	 * value is <code>"Solid"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.LineType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Line Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Line Type</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Line Type</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.LineType
 	 * @see #setLineType(LineType)
@@ -49,9 +48,10 @@
 	LineType getLineType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.LineTypeStyle#getLineType <em>Line Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.LineTypeStyle#getLineType <em>Line
+	 * Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Line Type</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.LineType
 	 * @see #getLineType()
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ListCompartment.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ListCompartment.java
index f566716..75f53d4 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ListCompartment.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ListCompartment.java
@@ -11,17 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>List Compartment</b></em>'.
- * <p><b>
- * Does not support addition/removal of:
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>List
+ * Compartment</b></em>'.
+ * <p>
+ * <b> Does not support addition/removal of:
  * <ul>
  * <li>Source Edges
- * <li>Target Edges 
+ * <li>Target Edges
  * </ul>
- * </b></p> 
+ * </b>
+ * </p>
  * <!-- end-user-doc -->
  *
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ListValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ListValueStyle.java
index 60cd724..fb2ca68 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ListValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ListValueStyle.java
@@ -14,16 +14,16 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>List
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.ListValueStyle#getRawValuesList <em>Raw Values List</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.ListValueStyle#getRawValuesList
+ * <em>Raw Values List</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getListValueStyle()
  * @model
@@ -32,13 +32,14 @@
 public interface ListValueStyle extends DataTypeStyle {
 	/**
 	 * Returns the value of the '<em><b>Raw Values List</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
+	 * The list contents are of type {@link java.lang.String}. <!-- begin-user-doc
+	 * -->
 	 * <p>
 	 * If the meaning of the '<em>Raw Values List</em>' attribute list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Raw Values List</em>' attribute list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getListValueStyle_RawValuesList()
 	 * @model unique="false"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Location.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Location.java
index 7a0c318..9da54cd 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Location.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Location.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Location</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Location</b></em>'.
  * <p>
  * The location constraint specifies the position of a node
  * </p>
@@ -23,11 +22,11 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Location#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Location#getY <em>Y</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Location#getX <em>X</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Location#getY <em>Y</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getLocation()
  * @model
@@ -37,11 +36,10 @@
  * @canBeSeenBy %partners
  */
 public interface Location extends LayoutConstraint {
-    /**
-	 * Returns the value of the '<em><b>X</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>X</b></em>' attribute. The default value is
+	 * <code>"0"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>X</em>' attribute.
 	 * @see #setX(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getLocation_X()
@@ -50,21 +48,20 @@
 	 */
 	int getX();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Location#getX <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Location#getX
+	 * <em>X</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>X</em>' attribute.
 	 * @see #getX()
 	 * @generated
 	 */
 	void setX(int value);
 
-    /**
-	 * Returns the value of the '<em><b>Y</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Y</b></em>' attribute. The default value is
+	 * <code>"0"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Y</em>' attribute.
 	 * @see #setY(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getLocation_Y()
@@ -73,10 +70,10 @@
 	 */
 	int getY();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Location#getY <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Location#getY
+	 * <em>Y</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Y</em>' attribute.
 	 * @see #getY()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/MeasurementUnit.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/MeasurementUnit.java
index a78b1be..779c663 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/MeasurementUnit.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/MeasurementUnit.java
@@ -18,23 +18,23 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Measurement Unit</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Measurement Unit</b></em>', and utility methods for working with
+ * them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getMeasurementUnit()
  * @model
  * @generated
  */
 public final class MeasurementUnit extends AbstractEnumerator {
-    /**
-	 * The '<em><b>Himetric</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>Himetric</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Himetric</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #HIMETRIC_LITERAL
 	 * @model name="Himetric"
 	 * @generated
@@ -42,14 +42,14 @@
 	 */
 	public static final int HIMETRIC = 0;
 
-    /**
-	 * The '<em><b>Pixel</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>Pixel</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Pixel</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Pixel</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PIXEL_LITERAL
 	 * @model name="Pixel"
 	 * @generated
@@ -57,50 +57,48 @@
 	 */
 	public static final int PIXEL = 1;
 
-    /**
-	 * The '<em><b>Himetric</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Himetric</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #HIMETRIC
 	 * @generated
 	 * @ordered
 	 */
 	public static final MeasurementUnit HIMETRIC_LITERAL = new MeasurementUnit(HIMETRIC, "Himetric", "Himetric"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Pixel</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Pixel</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #PIXEL
 	 * @generated
 	 * @ordered
 	 */
 	public static final MeasurementUnit PIXEL_LITERAL = new MeasurementUnit(PIXEL, "Pixel", "Pixel"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Measurement Unit</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Measurement Unit</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final MeasurementUnit[] VALUES_ARRAY =
-        new MeasurementUnit[] {
-			HIMETRIC_LITERAL,
-			PIXEL_LITERAL,
-		};
+	private static final MeasurementUnit[] VALUES_ARRAY = new MeasurementUnit[] { HIMETRIC_LITERAL, PIXEL_LITERAL, };
 
-    /**
-	 * A public read-only list of all the '<em><b>Measurement Unit</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * A public read-only list of all the '<em><b>Measurement Unit</b></em>'
+	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Measurement Unit</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Measurement Unit</b></em>' literal with the specified
+	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static MeasurementUnit get(String literal) {
@@ -113,13 +111,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Measurement Unit</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Measurement Unit</b></em>' literal with the specified
+	 * name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static MeasurementUnit getByName(String name) {
+	public static MeasurementUnit getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			MeasurementUnit result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -129,28 +129,32 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Measurement Unit</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Measurement Unit</b></em>' literal with the specified
+	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static MeasurementUnit get(int value) {
 		switch (value) {
-			case HIMETRIC: return HIMETRIC_LITERAL;
-			case PIXEL: return PIXEL_LITERAL;
+		case HIMETRIC:
+			return HIMETRIC_LITERAL;
+		case PIXEL:
+			return PIXEL_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private MeasurementUnit(int value, String name, String literal) {
+	private MeasurementUnit(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //MeasurementUnit
+} // MeasurementUnit
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/MultiDiagramLinkStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/MultiDiagramLinkStyle.java
index 13df111..af01ffd 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/MultiDiagramLinkStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/MultiDiagramLinkStyle.java
@@ -14,16 +14,16 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Multi Diagram Link Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Multi
+ * Diagram Link Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle#getDiagramLinks <em>Diagram Links</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle#getDiagramLinks
+ * <em>Diagram Links</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getMultiDiagramLinkStyle()
  * @model
@@ -31,14 +31,15 @@
  */
 public interface MultiDiagramLinkStyle extends Style {
 	/**
-	 * Returns the value of the '<em><b>Diagram Links</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Diagram}.
+	 * Returns the value of the '<em><b>Diagram Links</b></em>' reference list. The
+	 * list contents are of type {@link org.eclipse.gmf.runtime.notation.Diagram}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Diagram Links</em>' reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Diagram Links</em>' reference list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getMultiDiagramLinkStyle_DiagramLinks()
 	 * @model type="org.eclipse.gmf.runtime.notation.Diagram"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NamedStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NamedStyle.java
index 3c1d820..b8a1f76 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NamedStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NamedStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Named
+ * Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.NamedStyle#getName <em>Name</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.NamedStyle#getName
+ * <em>Name</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getNamedStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface NamedStyle extends Style {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getNamedStyle_Name()
@@ -46,9 +46,10 @@
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.NamedStyle#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.NamedStyle#getName <em>Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Node.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Node.java
index c450d7a..810cb9a 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Node.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Node.java
@@ -12,12 +12,11 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 import org.eclipse.emf.ecore.EClass;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Node</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Node</b></em>'.
  * <p>
  * A node is a view that can composed and laid out in a container view.
  * </p>
@@ -25,10 +24,11 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Node#getLayoutConstraint <em>Layout Constraint</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Node#getLayoutConstraint
+ * <em>Layout Constraint</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getNode()
  * @model
@@ -38,13 +38,15 @@
  * @canBeSeenBy %partners
  */
 public interface Node extends View {
-    /**
-	 * Returns the value of the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc -->
 	 * <p>
-	 * Layout constraints are used by layout managers to properly set the bounds of the node's visuals
+	 * Layout constraints are used by layout managers to properly set the bounds of
+	 * the node's visuals
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Layout Constraint</em>' containment reference.
 	 * @see #setLayoutConstraint(LayoutConstraint)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getNode_LayoutConstraint()
@@ -53,28 +55,33 @@
 	 */
 	LayoutConstraint getLayoutConstraint();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Node#getLayoutConstraint <em>Layout Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.Node#getLayoutConstraint <em>Layout
+	 * Constraint</em>}' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * Layout constraints are used by layout managers to properly set the bounds of the node's visuals
+	 * Layout constraints are used by layout managers to properly set the bounds of
+	 * the node's visuals
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Layout Constraint</em>' containment reference.
+	 * 
+	 * @param value the new value of the '<em>Layout Constraint</em>' containment
+	 *              reference.
 	 * @see #getLayoutConstraint()
 	 * @generated
 	 */
 	void setLayoutConstraint(LayoutConstraint value);
 
-    /**
+	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A utility method to create a <code>LayoutConstraint</code> object from the given <code>EClass</code>
-	 * and then sets the node's <em>LayoutConstraint</em> property to the new object.
+	 * A utility method to create a <code>LayoutConstraint</code> object from the
+	 * given <code>EClass</code> and then sets the node's <em>LayoutConstraint</em>
+	 * property to the new object.
 	 * </p>
 	 * 
-	 * @param eClass the <code>EClass</code> to be used in creating the <code>LayoutConstraint</code> object
-	 * <!-- end-user-doc -->
+	 * @param eClass the <code>EClass</code> to be used in creating the
+	 *               <code>LayoutConstraint</code> object <!-- end-user-doc -->
 	 * @model
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NodeEntry.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NodeEntry.java
index e0251ba..3c507e9 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NodeEntry.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NodeEntry.java
@@ -14,15 +14,16 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Node Entry</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Node
+ * Entry</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.NodeEntry#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.NodeEntry#getKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.NodeEntry#getValue
+ * <em>Value</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.NodeEntry#getKey
+ * <em>Key</em>}</li>
  * </ul>
  * </p>
  *
@@ -32,15 +33,15 @@
  */
 public interface NodeEntry extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The default value is <code>"Center"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.Alignment}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. The default value
+	 * is <code>"Center"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.Alignment}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Alignment
 	 * @see #setValue(Alignment)
@@ -51,9 +52,10 @@
 	Alignment getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.NodeEntry#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.NodeEntry#getValue <em>Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Alignment
 	 * @see #getValue()
@@ -62,13 +64,14 @@
 	void setValue(Alignment value);
 
 	/**
-	 * Returns the value of the '<em><b>Key</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Key</b></em>' reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Key</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Key</em>' reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Key</em>' reference.
 	 * @see #setKey(Node)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getNodeEntry_Key()
@@ -78,9 +81,10 @@
 	Node getKey();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.NodeEntry#getKey <em>Key</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.NodeEntry#getKey <em>Key</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Key</em>' reference.
 	 * @see #getKey()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationFactory.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationFactory.java
index 3a0935f..7a1ed44 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationFactory.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationFactory.java
@@ -15,10 +15,9 @@
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
+ * create method for each non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage
  * @generated
  */
@@ -26,590 +25,590 @@
  * @canBeSeenBy %partners
  */
 public interface NotationFactory extends EFactory {
-    /**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The singleton instance of the factory. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	NotationFactory eINSTANCE = org.eclipse.gmf.runtime.notation.impl.NotationFactoryImpl.init();
 
-    /**
-	 * Returns a new object of class '<em>Edge</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Edge</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Edge</em>'.
 	 * @generated
 	 */
 	Edge createEdge();
 
-    /**
-	 * Returns a new object of class '<em>Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Node</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Node</em>'.
 	 * @generated
 	 */
 	Node createNode();
 
-    /**
-	 * Returns a new object of class '<em>Fill Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Fill Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Fill Style</em>'.
 	 * @generated
 	 */
 	FillStyle createFillStyle();
 
-    /**
-	 * Returns a new object of class '<em>Line Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Line Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Line Style</em>'.
 	 * @generated
 	 */
 	LineStyle createLineStyle();
 
-    /**
-	 * Returns a new object of class '<em>Font Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Font Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Font Style</em>'.
 	 * @generated
 	 */
 	FontStyle createFontStyle();
 
-    /**
-	 * Returns a new object of class '<em>Title Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Title Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Title Style</em>'.
 	 * @generated
 	 */
 	TitleStyle createTitleStyle();
 
-    /**
-	 * Returns a new object of class '<em>Sorting Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Sorting Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Sorting Style</em>'.
 	 * @generated
 	 */
 	SortingStyle createSortingStyle();
 
-    /**
-	 * Returns a new object of class '<em>Description Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Description Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Description Style</em>'.
 	 * @generated
 	 */
 	DescriptionStyle createDescriptionStyle();
 
-    /**
-	 * Returns a new object of class '<em>Size</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Size</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Size</em>'.
 	 * @generated
 	 */
 	Size createSize();
 
-    /**
-	 * Returns a new object of class '<em>Location</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Location</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Location</em>'.
 	 * @generated
 	 */
 	Location createLocation();
 
-    /**
-	 * Returns a new object of class '<em>Bounds</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Bounds</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Bounds</em>'.
 	 * @generated
 	 */
 	Bounds createBounds();
 
-    /**
-	 * Returns a new object of class '<em>Ratio</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Ratio</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Ratio</em>'.
 	 * @generated
 	 */
 	Ratio createRatio();
 
-    /**
-	 * Returns a new object of class '<em>Identity Anchor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Identity Anchor</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Identity Anchor</em>'.
 	 * @generated
 	 */
 	IdentityAnchor createIdentityAnchor();
 
-    /**
-	 * Returns a new object of class '<em>Routing Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Routing Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Routing Style</em>'.
 	 * @generated
 	 */
 	RoutingStyle createRoutingStyle();
 
-    /**
-	 * Returns a new object of class '<em>Relative Bendpoints</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Relative Bendpoints</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Relative Bendpoints</em>'.
 	 * @generated
 	 */
 	RelativeBendpoints createRelativeBendpoints();
 
-    /**
-	 * Returns a new object of class '<em>Canonical Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Canonical Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Canonical Style</em>'.
 	 * @generated
 	 */
 	CanonicalStyle createCanonicalStyle();
 
-    /**
-	 * Returns a new object of class '<em>Shape Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Shape Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Shape Style</em>'.
 	 * @generated
 	 */
 	ShapeStyle createShapeStyle();
 
-    /**
-	 * Returns a new object of class '<em>Connector Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Connector Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Connector Style</em>'.
 	 * @generated
 	 */
 	ConnectorStyle createConnectorStyle();
 
-    /**
-	 * Returns a new object of class '<em>Diagram</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Diagram</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Diagram</em>'.
 	 * @generated
 	 */
 	Diagram createDiagram();
 
-    /**
-	 * Returns a new object of class '<em>Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Image</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Image</em>'.
 	 * @generated
 	 */
 	Image createImage();
 
-    /**
-	 * Returns a new object of class '<em>Page Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Page Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Page Style</em>'.
 	 * @generated
 	 */
 	PageStyle createPageStyle();
 
-    /**
-	 * Returns a new object of class '<em>Drawer Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Drawer Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Drawer Style</em>'.
 	 * @generated
 	 */
 	DrawerStyle createDrawerStyle();
 
-    /**
-	 * Returns a new object of class '<em>Guide Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Guide Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Guide Style</em>'.
 	 * @generated
 	 */
 	GuideStyle createGuideStyle();
 
-    /**
-	 * Returns a new object of class '<em>Guide</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Guide</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Guide</em>'.
 	 * @generated
 	 */
 	Guide createGuide();
 
-    /**
-	 * Returns a new object of class '<em>Filtering Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Filtering Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Filtering Style</em>'.
 	 * @generated
 	 */
 	FilteringStyle createFilteringStyle();
 
-    /**
-	 * Returns a new object of class '<em>Diagram Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Diagram Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Diagram Style</em>'.
 	 * @generated
 	 */
 	DiagramStyle createDiagramStyle();
 
-    /**
-	 * Returns a new object of class '<em>Image Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Image Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Image Style</em>'.
 	 * @generated
 	 */
 	ImageStyle createImageStyle();
 
-    /**
-	 * Returns a new object of class '<em>Image Buffer Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Image Buffer Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Image Buffer Style</em>'.
 	 * @generated
 	 */
 	ImageBufferStyle createImageBufferStyle();
 
-    /**
-	 * Returns a new object of class '<em>Properties Set Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Properties Set Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Properties Set Style</em>'.
 	 * @generated
 	 */
 	PropertiesSetStyle createPropertiesSetStyle();
 
-				/**
-	 * Returns a new object of class '<em>Property Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Property Value</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Property Value</em>'.
 	 * @generated
 	 */
 	PropertyValue createPropertyValue();
 
-				/**
-	 * Returns a new object of class '<em>Single Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Single Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Single Value Style</em>'.
 	 * @generated
 	 */
 	SingleValueStyle createSingleValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>List Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>List Value Style</em>'.
 	 * @generated
 	 */
 	ListValueStyle createListValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>Named Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Named Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Named Style</em>'.
 	 * @generated
 	 */
 	NamedStyle createNamedStyle();
 
-				/**
-	 * Returns a new object of class '<em>Data Type Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Data Type Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Data Type Style</em>'.
 	 * @generated
 	 */
 	DataTypeStyle createDataTypeStyle();
 
-				/**
-	 * Returns a new object of class '<em>Int Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Int Value Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Int Value Style</em>'.
 	 * @generated
 	 */
 	IntValueStyle createIntValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>Int List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Int List Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Int List Value Style</em>'.
 	 * @generated
 	 */
 	IntListValueStyle createIntListValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>Boolean Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Boolean Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Boolean Value Style</em>'.
 	 * @generated
 	 */
 	BooleanValueStyle createBooleanValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>Double Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Double Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Double Value Style</em>'.
 	 * @generated
 	 */
 	DoubleValueStyle createDoubleValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>Double List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Double List Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Double List Value Style</em>'.
 	 * @generated
 	 */
 	DoubleListValueStyle createDoubleListValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>String Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>String Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>String Value Style</em>'.
 	 * @generated
 	 */
 	StringValueStyle createStringValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>String List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>String List Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>String List Value Style</em>'.
 	 * @generated
 	 */
 	StringListValueStyle createStringListValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>EObject Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>EObject Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>EObject Value Style</em>'.
 	 * @generated
 	 */
 	EObjectValueStyle createEObjectValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>EObject List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>EObject List Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>EObject List Value Style</em>'.
 	 * @generated
 	 */
 	EObjectListValueStyle createEObjectListValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>Byte Array Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Byte Array Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Byte Array Value Style</em>'.
 	 * @generated
 	 */
 	ByteArrayValueStyle createByteArrayValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>Boolean List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Boolean List Value Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Boolean List Value Style</em>'.
 	 * @generated
 	 */
 	BooleanListValueStyle createBooleanListValueStyle();
 
-				/**
-	 * Returns a new object of class '<em>Hinted Diagram Link Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Hinted Diagram Link Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hinted Diagram Link Style</em>'.
 	 * @generated
 	 */
 	HintedDiagramLinkStyle createHintedDiagramLinkStyle();
 
-				/**
-	 * Returns a new object of class '<em>Diagram Link Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Diagram Link Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Diagram Link Style</em>'.
 	 * @generated
 	 */
 	DiagramLinkStyle createDiagramLinkStyle();
 
-				/**
-	 * Returns a new object of class '<em>Multi Diagram Link Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Multi Diagram Link Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Multi Diagram Link Style</em>'.
 	 * @generated
 	 */
 	MultiDiagramLinkStyle createMultiDiagramLinkStyle();
 
-				/**
-	 * Returns a new object of class '<em>Text Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Text Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Text Style</em>'.
 	 * @generated
 	 */
 	TextStyle createTextStyle();
 
-				/**
-	 * Returns a new object of class '<em>Line Type Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Line Type Style</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Line Type Style</em>'.
 	 * @generated
 	 */
 	LineTypeStyle createLineTypeStyle();
 
-				/**
-	 * Returns a new object of class '<em>Arrow Style</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Arrow Style</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Arrow Style</em>'.
 	 * @generated
 	 */
 	ArrowStyle createArrowStyle();
 
-				/**
-	 * Returns a new object of class '<em>Shape</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Shape</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Shape</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	Shape createShape();
 
-				/**
-	 * Returns a new object of class '<em>Compartment</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Compartment</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Compartment</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	Compartment createCompartment();
 
-				/**
-	 * Returns a new object of class '<em>List Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>List Compartment</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>List Compartment</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	ListCompartment createListCompartment();
 
-				/**
-	 * Returns a new object of class '<em>Connector</em>'.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Connector</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Connector</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	Connector createConnector();
 
-				/**
-	 * Returns a new object of class '<em>Standard Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Standard Diagram</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Standard Diagram</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	StandardDiagram createStandardDiagram();
 
-				/**
-	 * Returns a new object of class '<em>Decoration Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Decoration Node</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Decoration Node</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	DecorationNode createDecorationNode();
 
-				/**
-	 * Returns a new object of class '<em>Basic Decoration Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Basic Decoration Node</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Basic Decoration Node</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	BasicDecorationNode createBasicDecorationNode();
 
-				/**
-	 * Returns a new object of class '<em>Basic Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Basic Compartment</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Basic Compartment</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	BasicCompartment createBasicCompartment();
 
-				/**
-	 * Returns a new object of class '<em>Basic Semantic Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Basic Semantic Compartment</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Basic Semantic Compartment</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	BasicSemanticCompartment createBasicSemanticCompartment();
 
-				/**
-	 * Returns a new object of class '<em>Semantic List Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Semantic List Compartment</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Semantic List Compartment</em>'.
 	 * @generated
 	 * @since 1.2
 	 */
 	SemanticListCompartment createSemanticListCompartment();
 
-				/**
-	 * Returns a new object of class '<em>Rounded Corners Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns a new object of class '<em>Rounded Corners Style</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Rounded Corners Style</em>'.
 	 * @generated
 	 * @since 1.4
 	 */
 	RoundedCornersStyle createRoundedCornersStyle();
 
-				/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the package supported by this factory. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	NotationPackage getNotationPackage();
 
-} //NotationFactory
+} // NotationFactory
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPackage.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPackage.java
index 9e5761f..35b6f95 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPackage.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPackage.java
@@ -21,57 +21,55 @@
 import org.eclipse.emf.ecore.EcorePackage;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
+ * accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationFactory
  * @model kind="package"
  * @generated
  */
 public interface NotationPackage extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "notation"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.eclipse.org/gmf/runtime/1.0.2/notation"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "notation"; //$NON-NLS-1$
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the package. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	NotationPackage eINSTANCE = org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl <em>View</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl <em>View</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ViewImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getView()
 	 * @generated
@@ -79,63 +77,63 @@
 	int VIEW = 18;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__VISIBLE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__TYPE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__MUTABLE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__SOURCE_EDGES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__TARGET_EDGES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -143,53 +141,54 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__STYLES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__ELEMENT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__DIAGRAM = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW__TRANSIENT_CHILDREN = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 9;
 
 	/**
-	 * The number of structural features of the '<em>View</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>View</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VIEW_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 10;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl <em>Edge</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl <em>Edge</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.EdgeImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getEdge()
 	 * @generated
@@ -197,63 +196,63 @@
 	int EDGE = 0;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__EANNOTATIONS = VIEW__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__VISIBLE = VIEW__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__TYPE = VIEW__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__MUTABLE = VIEW__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__SOURCE_EDGES = VIEW__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__TARGET_EDGES = VIEW__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -261,53 +260,53 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__STYLES = VIEW__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__ELEMENT = VIEW__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__DIAGRAM = VIEW__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__TRANSIENT_CHILDREN = VIEW__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__SOURCE = VIEW_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -315,8 +314,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Bendpoints</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -324,8 +323,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Source Anchor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -333,26 +332,27 @@
 
 	/**
 	 * The feature id for the '<em><b>Target Anchor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE__TARGET_ANCHOR = VIEW_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the '<em>Edge</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Edge</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EDGE_FEATURE_COUNT = VIEW_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.NodeImpl <em>Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.NodeImpl <em>Node</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.NodeImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getNode()
 	 * @generated
@@ -360,63 +360,63 @@
 	int NODE = 1;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__EANNOTATIONS = VIEW__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__VISIBLE = VIEW__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__TYPE = VIEW__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__MUTABLE = VIEW__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__SOURCE_EDGES = VIEW__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__TARGET_EDGES = VIEW__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -424,62 +424,62 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__STYLES = VIEW__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__ELEMENT = VIEW__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__DIAGRAM = VIEW__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__TRANSIENT_CHILDREN = VIEW__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE__LAYOUT_CONSTRAINT = VIEW_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Node</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE_FEATURE_COUNT = VIEW_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Style
+	 * <em>Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.Style
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStyle()
 	 * @generated
@@ -487,18 +487,19 @@
 	int STYLE = 2;
 
 	/**
-	 * The number of structural features of the '<em>Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STYLE_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl <em>Fill Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl <em>Fill
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.FillStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFillStyle()
 	 * @generated
@@ -506,45 +507,46 @@
 	int FILL_STYLE = 3;
 
 	/**
-	 * The feature id for the '<em><b>Fill Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Fill Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILL_STYLE__FILL_COLOR = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Transparency</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transparency</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILL_STYLE__TRANSPARENCY = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Gradient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Gradient</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILL_STYLE__GRADIENT = STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Fill Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Fill Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILL_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.LineStyleImpl <em>Line Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.LineStyleImpl <em>Line
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.LineStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLineStyle()
 	 * @generated
@@ -552,36 +554,37 @@
 	int LINE_STYLE = 4;
 
 	/**
-	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LINE_STYLE__LINE_COLOR = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LINE_STYLE__LINE_WIDTH = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Line Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Line Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LINE_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl <em>Font Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl <em>Font
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.FontStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFontStyle()
 	 * @generated
@@ -589,81 +592,82 @@
 	int FONT_STYLE = 5;
 
 	/**
-	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FONT_STYLE__FONT_COLOR = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FONT_STYLE__FONT_NAME = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FONT_STYLE__FONT_HEIGHT = STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Bold</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Bold</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FONT_STYLE__BOLD = STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Italic</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Italic</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FONT_STYLE__ITALIC = STYLE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Underline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Underline</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FONT_STYLE__UNDERLINE = STYLE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FONT_STYLE__STRIKE_THROUGH = STYLE_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the '<em>Font Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Font Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FONT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl <em>Title Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl <em>Title
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getTitleStyle()
 	 * @generated
@@ -671,27 +675,28 @@
 	int TITLE_STYLE = 6;
 
 	/**
-	 * The feature id for the '<em><b>Show Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Show Title</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TITLE_STYLE__SHOW_TITLE = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Title Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Title Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TITLE_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl <em>Sorting Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl <em>Sorting
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSortingStyle()
 	 * @generated
@@ -699,45 +704,47 @@
 	int SORTING_STYLE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Sorting</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorting</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SORTING_STYLE__SORTING = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sorting Keys</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorting Keys</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SORTING_STYLE__SORTING_KEYS = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Sorted Objects</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorted Objects</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SORTING_STYLE__SORTED_OBJECTS = STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Sorting Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Sorting Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SORTING_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl <em>Description Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl
+	 * <em>Description Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDescriptionStyle()
 	 * @generated
@@ -745,9 +752,9 @@
 	int DESCRIPTION_STYLE = 8;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Description</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -755,17 +762,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Description Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DESCRIPTION_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.LayoutConstraint <em>Layout Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.LayoutConstraint <em>Layout
+	 * Constraint</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.LayoutConstraint
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLayoutConstraint()
 	 * @generated
@@ -774,17 +782,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Layout Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LAYOUT_CONSTRAINT_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.SizeImpl <em>Size</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.SizeImpl <em>Size</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.SizeImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSize()
 	 * @generated
@@ -792,36 +801,37 @@
 	int SIZE = 10;
 
 	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SIZE__WIDTH = LAYOUT_CONSTRAINT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Height</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SIZE__HEIGHT = LAYOUT_CONSTRAINT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Size</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Size</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SIZE_FEATURE_COUNT = LAYOUT_CONSTRAINT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.LocationImpl <em>Location</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.LocationImpl
+	 * <em>Location</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.LocationImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLocation()
 	 * @generated
@@ -829,36 +839,37 @@
 	int LOCATION = 11;
 
 	/**
-	 * The feature id for the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>X</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LOCATION__X = LAYOUT_CONSTRAINT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Y</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LOCATION__Y = LAYOUT_CONSTRAINT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Location</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Location</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LOCATION_FEATURE_COUNT = LAYOUT_CONSTRAINT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.BoundsImpl <em>Bounds</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.BoundsImpl <em>Bounds</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.BoundsImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBounds()
 	 * @generated
@@ -866,54 +877,55 @@
 	int BOUNDS = 12;
 
 	/**
-	 * The feature id for the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>X</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOUNDS__X = LOCATION__X;
 
 	/**
-	 * The feature id for the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Y</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOUNDS__Y = LOCATION__Y;
 
 	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOUNDS__WIDTH = LOCATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Height</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOUNDS__HEIGHT = LOCATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Bounds</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Bounds</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOUNDS_FEATURE_COUNT = LOCATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.RatioImpl <em>Ratio</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.RatioImpl <em>Ratio</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.RatioImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRatio()
 	 * @generated
@@ -921,27 +933,27 @@
 	int RATIO = 13;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RATIO__VALUE = LAYOUT_CONSTRAINT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Ratio</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Ratio</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RATIO_FEATURE_COUNT = LAYOUT_CONSTRAINT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Anchor <em>Anchor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Anchor
+	 * <em>Anchor</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.Anchor
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getAnchor()
 	 * @generated
@@ -949,18 +961,19 @@
 	int ANCHOR = 14;
 
 	/**
-	 * The number of structural features of the '<em>Anchor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Anchor</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANCHOR_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Bendpoints <em>Bendpoints</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.Bendpoints <em>Bendpoints</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.Bendpoints
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBendpoints()
 	 * @generated
@@ -968,18 +981,19 @@
 	int BENDPOINTS = 15;
 
 	/**
-	 * The number of structural features of the '<em>Bendpoints</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Bendpoints</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BENDPOINTS_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl <em>Identity Anchor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl <em>Identity
+	 * Anchor</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getIdentityAnchor()
 	 * @generated
@@ -987,9 +1001,9 @@
 	int IDENTITY_ANCHOR = 16;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -997,17 +1011,19 @@
 
 	/**
 	 * The number of structural features of the '<em>Identity Anchor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IDENTITY_ANCHOR_FEATURE_COUNT = ANCHOR_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl <em>Rounded Corners Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl
+	 * <em>Rounded Corners Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRoundedCornersStyle()
 	 * @generated
@@ -1016,26 +1032,27 @@
 
 	/**
 	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Rounded Corners Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Rounded Corners Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUNDED_CORNERS_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl <em>Routing Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl <em>Routing
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRoutingStyle()
 	 * @generated
@@ -1044,90 +1061,92 @@
 
 	/**
 	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * Left in for backwards compatibility
+	 * <!-- begin-user-doc --> <!-- end-user-doc --> Left in for backwards
+	 * compatibility
+	 * 
 	 * @ordered
 	 * @deprecated Use ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS instead
 	 */
 	int ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS = ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS;
 
 	/**
-	 * The feature id for the '<em><b>Routing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Routing</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUTING_STYLE__ROUTING = ROUNDED_CORNERS_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Smoothness</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Smoothness</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUTING_STYLE__SMOOTHNESS = ROUNDED_CORNERS_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Avoid Obstructions</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Avoid Obstructions</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUTING_STYLE__AVOID_OBSTRUCTIONS = ROUNDED_CORNERS_STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Closest Distance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Closest Distance</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUTING_STYLE__CLOSEST_DISTANCE = ROUNDED_CORNERS_STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Jump Link Status</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Link Status</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUTING_STYLE__JUMP_LINK_STATUS = ROUNDED_CORNERS_STYLE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Jump Link Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Link Type</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUTING_STYLE__JUMP_LINK_TYPE = ROUNDED_CORNERS_STYLE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Jump Links Reverse</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Links Reverse</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUTING_STYLE__JUMP_LINKS_REVERSE = ROUNDED_CORNERS_STYLE_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the '<em>Routing Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Routing Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROUTING_STYLE_FEATURE_COUNT = ROUNDED_CORNERS_STYLE_FEATURE_COUNT + 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl <em>Relative Bendpoints</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl
+	 * <em>Relative Bendpoints</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRelativeBendpoints()
 	 * @generated
@@ -1135,27 +1154,28 @@
 	int RELATIVE_BENDPOINTS = 19;
 
 	/**
-	 * The feature id for the '<em><b>Points</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Points</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATIVE_BENDPOINTS__POINTS = BENDPOINTS_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Relative Bendpoints</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Relative Bendpoints</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RELATIVE_BENDPOINTS_FEATURE_COUNT = BENDPOINTS_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl <em>Diagram</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl <em>Diagram</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DiagramImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDiagram()
 	 * @generated
@@ -1163,63 +1183,63 @@
 	int DIAGRAM = 20;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__EANNOTATIONS = VIEW__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__VISIBLE = VIEW__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__TYPE = VIEW__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__MUTABLE = VIEW__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__SOURCE_EDGES = VIEW__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__TARGET_EDGES = VIEW__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1227,89 +1247,90 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__STYLES = VIEW__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__ELEMENT = VIEW__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__DIAGRAM = VIEW__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__TRANSIENT_CHILDREN = VIEW__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__NAME = VIEW_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Measurement Unit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Measurement Unit</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__MEASUREMENT_UNIT = VIEW_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Edges</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Edges</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__PERSISTED_EDGES = VIEW_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Transient Edges</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Edges</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM__TRANSIENT_EDGES = VIEW_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Diagram</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_FEATURE_COUNT = VIEW_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ImageImpl <em>Image</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ImageImpl <em>Image</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ImageImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getImage()
 	 * @generated
@@ -1317,27 +1338,29 @@
 	int IMAGE = 21;
 
 	/**
-	 * The feature id for the '<em><b>Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMAGE__DATA = 0;
 
 	/**
-	 * The number of structural features of the '<em>Image</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Image</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMAGE_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl <em>Canonical Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl
+	 * <em>Canonical Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getCanonicalStyle()
 	 * @generated
@@ -1345,9 +1368,9 @@
 	int CANONICAL_STYLE = 22;
 
 	/**
-	 * The feature id for the '<em><b>Canonical</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Canonical</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1355,17 +1378,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Canonical Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CANONICAL_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl <em>Shape Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl <em>Shape
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getShapeStyle()
 	 * @generated
@@ -1373,117 +1397,117 @@
 	int SHAPE_STYLE = 23;
 
 	/**
-	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__FONT_COLOR = FONT_STYLE__FONT_COLOR;
 
 	/**
-	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__FONT_NAME = FONT_STYLE__FONT_NAME;
 
 	/**
-	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__FONT_HEIGHT = FONT_STYLE__FONT_HEIGHT;
 
 	/**
-	 * The feature id for the '<em><b>Bold</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Bold</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__BOLD = FONT_STYLE__BOLD;
 
 	/**
-	 * The feature id for the '<em><b>Italic</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Italic</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__ITALIC = FONT_STYLE__ITALIC;
 
 	/**
-	 * The feature id for the '<em><b>Underline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Underline</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__UNDERLINE = FONT_STYLE__UNDERLINE;
 
 	/**
-	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__STRIKE_THROUGH = FONT_STYLE__STRIKE_THROUGH;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Description</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__DESCRIPTION = FONT_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Fill Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Fill Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__FILL_COLOR = FONT_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Transparency</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transparency</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__TRANSPARENCY = FONT_STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Gradient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Gradient</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__GRADIENT = FONT_STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__LINE_COLOR = FONT_STYLE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1491,26 +1515,28 @@
 
 	/**
 	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS = FONT_STYLE_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the '<em>Shape Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Shape Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_STYLE_FEATURE_COUNT = FONT_STYLE_FEATURE_COUNT + 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl <em>Connector Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl
+	 * <em>Connector Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getConnectorStyle()
 	 * @generated
@@ -1519,89 +1545,89 @@
 
 	/**
 	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS = ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS;
 
 	/**
-	 * The feature id for the '<em><b>Routing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Routing</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__ROUTING = ROUTING_STYLE__ROUTING;
 
 	/**
-	 * The feature id for the '<em><b>Smoothness</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Smoothness</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__SMOOTHNESS = ROUTING_STYLE__SMOOTHNESS;
 
 	/**
-	 * The feature id for the '<em><b>Avoid Obstructions</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Avoid Obstructions</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__AVOID_OBSTRUCTIONS = ROUTING_STYLE__AVOID_OBSTRUCTIONS;
 
 	/**
-	 * The feature id for the '<em><b>Closest Distance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Closest Distance</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__CLOSEST_DISTANCE = ROUTING_STYLE__CLOSEST_DISTANCE;
 
 	/**
-	 * The feature id for the '<em><b>Jump Link Status</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Link Status</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__JUMP_LINK_STATUS = ROUTING_STYLE__JUMP_LINK_STATUS;
 
 	/**
-	 * The feature id for the '<em><b>Jump Link Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Link Type</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__JUMP_LINK_TYPE = ROUTING_STYLE__JUMP_LINK_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Jump Links Reverse</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Links Reverse</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__JUMP_LINKS_REVERSE = ROUTING_STYLE__JUMP_LINKS_REVERSE;
 
 	/**
-	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE__LINE_COLOR = ROUTING_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1609,17 +1635,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Connector Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_STYLE_FEATURE_COUNT = ROUTING_STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl <em>Page Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl <em>Page
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.PageStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getPageStyle()
 	 * @generated
@@ -1627,54 +1654,55 @@
 	int PAGE_STYLE = 25;
 
 	/**
-	 * The feature id for the '<em><b>Page X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page X</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PAGE_STYLE__PAGE_X = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Page Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Y</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PAGE_STYLE__PAGE_Y = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Page Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Width</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PAGE_STYLE__PAGE_WIDTH = STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Page Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Height</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PAGE_STYLE__PAGE_HEIGHT = STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>Page Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Page Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PAGE_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl <em>Drawer Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl <em>Drawer
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDrawerStyle()
 	 * @generated
@@ -1682,27 +1710,28 @@
 	int DRAWER_STYLE = 26;
 
 	/**
-	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Collapsed</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DRAWER_STYLE__COLLAPSED = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Drawer Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Drawer Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DRAWER_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl <em>Guide Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl <em>Guide
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getGuideStyle()
 	 * @generated
@@ -1710,36 +1739,37 @@
 	int GUIDE_STYLE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Horizontal Guides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Horizontal Guides</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GUIDE_STYLE__HORIZONTAL_GUIDES = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Vertical Guides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Vertical Guides</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GUIDE_STYLE__VERTICAL_GUIDES = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Guide Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Guide Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GUIDE_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.GuideImpl <em>Guide</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.GuideImpl <em>Guide</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.GuideImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getGuide()
 	 * @generated
@@ -1747,36 +1777,37 @@
 	int GUIDE = 28;
 
 	/**
-	 * The feature id for the '<em><b>Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Position</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GUIDE__POSITION = 0;
 
 	/**
-	 * The feature id for the '<em><b>Node Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Node Map</b></em>' map. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GUIDE__NODE_MAP = 1;
 
 	/**
-	 * The number of structural features of the '<em>Guide</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Guide</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GUIDE_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl <em>Node Entry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl <em>Node
+	 * Entry</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getNodeEntry()
 	 * @generated
@@ -1784,36 +1815,38 @@
 	int NODE_ENTRY = 29;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE_ENTRY__VALUE = 0;
 
 	/**
-	 * The feature id for the '<em><b>Key</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Key</b></em>' reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE_ENTRY__KEY = 1;
 
 	/**
-	 * The number of structural features of the '<em>Node Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Node Entry</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NODE_ENTRY_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl <em>Filtering Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl
+	 * <em>Filtering Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFilteringStyle()
 	 * @generated
@@ -1821,18 +1854,18 @@
 	int FILTERING_STYLE = 30;
 
 	/**
-	 * The feature id for the '<em><b>Filtering</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filtering</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTERING_STYLE__FILTERING = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Filtering Keys</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filtering Keys</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1840,8 +1873,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Filtered Objects</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1849,17 +1882,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Filtering Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTERING_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl <em>Diagram Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl <em>Diagram
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDiagramStyle()
 	 * @generated
@@ -1867,81 +1901,82 @@
 	int DIAGRAM_STYLE = 31;
 
 	/**
-	 * The feature id for the '<em><b>Page X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page X</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_STYLE__PAGE_X = PAGE_STYLE__PAGE_X;
 
 	/**
-	 * The feature id for the '<em><b>Page Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Y</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_STYLE__PAGE_Y = PAGE_STYLE__PAGE_Y;
 
 	/**
-	 * The feature id for the '<em><b>Page Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Width</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_STYLE__PAGE_WIDTH = PAGE_STYLE__PAGE_WIDTH;
 
 	/**
-	 * The feature id for the '<em><b>Page Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Height</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_STYLE__PAGE_HEIGHT = PAGE_STYLE__PAGE_HEIGHT;
 
 	/**
-	 * The feature id for the '<em><b>Horizontal Guides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Horizontal Guides</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_STYLE__HORIZONTAL_GUIDES = PAGE_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Vertical Guides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Vertical Guides</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_STYLE__VERTICAL_GUIDES = PAGE_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Description</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_STYLE__DESCRIPTION = PAGE_STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Diagram Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Diagram Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_STYLE_FEATURE_COUNT = PAGE_STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl <em>Image Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl <em>Image
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getImageStyle()
 	 * @generated
@@ -1949,9 +1984,9 @@
 	int IMAGE_STYLE = 32;
 
 	/**
-	 * The feature id for the '<em><b>Anti Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Anti Alias</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1959,8 +1994,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Maintain Aspect Ratio</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1968,26 +2003,27 @@
 
 	/**
 	 * The feature id for the '<em><b>Crop Bound</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMAGE_STYLE__CROP_BOUND = STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Image Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Image Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMAGE_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl <em>Image Buffer Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl <em>Image
+	 * Buffer Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getImageBufferStyle()
 	 * @generated
@@ -1995,9 +2031,9 @@
 	int IMAGE_BUFFER_STYLE = 33;
 
 	/**
-	 * The feature id for the '<em><b>Anti Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Anti Alias</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2005,8 +2041,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Maintain Aspect Ratio</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2014,8 +2050,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Crop Bound</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2023,8 +2059,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Image Buffer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2032,17 +2068,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Image Buffer Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMAGE_BUFFER_STYLE_FEATURE_COUNT = IMAGE_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl <em>Named Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl <em>Named
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getNamedStyle()
 	 * @generated
@@ -2050,27 +2087,29 @@
 	int NAMED_STYLE = 39;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_STYLE__NAME = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Named Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Named Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl <em>Properties Set Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl
+	 * <em>Properties Set Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getPropertiesSetStyle()
 	 * @generated
@@ -2078,36 +2117,38 @@
 	int PROPERTIES_SET_STYLE = 34;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROPERTIES_SET_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Properties Map</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Properties Map</b></em>' map. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROPERTIES_SET_STYLE__PROPERTIES_MAP = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Properties Set Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Properties Set Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROPERTIES_SET_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl <em>String To Property Value Map Entry</em>}' class.
-	 * <!-- begin-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl
+	 * <em>String To Property Value Map Entry</em>}' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStringToPropertyValueMapEntry()
 	 * @generated
@@ -2115,36 +2156,37 @@
 	int STRING_TO_PROPERTY_VALUE_MAP_ENTRY = 35;
 
 	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY = 0;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE = 1;
 
 	/**
-	 * The number of structural features of the '<em>String To Property Value Map Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>String To Property Value Map
+	 * Entry</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STRING_TO_PROPERTY_VALUE_MAP_ENTRY_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.StringObjectConverter <em>String Object Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.StringObjectConverter <em>String
+	 * Object Converter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.StringObjectConverter
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStringObjectConverter()
 	 * @generated
@@ -2152,18 +2194,19 @@
 	int STRING_OBJECT_CONVERTER = 40;
 
 	/**
-	 * The number of structural features of the '<em>String Object Converter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>String Object Converter</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STRING_OBJECT_CONVERTER_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl <em>Property Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl <em>Property
+	 * Value</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getPropertyValue()
 	 * @generated
@@ -2171,18 +2214,18 @@
 	int PROPERTY_VALUE = 36;
 
 	/**
-	 * The feature id for the '<em><b>Raw Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Raw Value</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROPERTY_VALUE__RAW_VALUE = STRING_OBJECT_CONVERTER_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Instance Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Instance Type</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2190,17 +2233,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Property Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROPERTY_VALUE_FEATURE_COUNT = STRING_OBJECT_CONVERTER_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl <em>Data Type Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl <em>Data Type
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDataTypeStyle()
 	 * @generated
@@ -2208,18 +2252,18 @@
 	int DATA_TYPE_STYLE = 41;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATA_TYPE_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Instance Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Instance Type</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2227,17 +2271,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Data Type Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DATA_TYPE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl <em>Single Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl <em>Single
+	 * Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSingleValueStyle()
 	 * @generated
@@ -2245,27 +2290,27 @@
 	int SINGLE_VALUE_STYLE = 37;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SINGLE_VALUE_STYLE__NAME = DATA_TYPE_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Instance Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Instance Type</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SINGLE_VALUE_STYLE__INSTANCE_TYPE = DATA_TYPE_STYLE__INSTANCE_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Raw Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Raw Value</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2273,17 +2318,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Single Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SINGLE_VALUE_STYLE_FEATURE_COUNT = DATA_TYPE_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl <em>List Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl <em>List
+	 * Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getListValueStyle()
 	 * @generated
@@ -2291,27 +2337,27 @@
 	int LIST_VALUE_STYLE = 38;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_VALUE_STYLE__NAME = DATA_TYPE_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Instance Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Instance Type</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_VALUE_STYLE__INSTANCE_TYPE = DATA_TYPE_STYLE__INSTANCE_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Raw Values List</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Raw Values List</b></em>' attribute list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2319,17 +2365,18 @@
 
 	/**
 	 * The number of structural features of the '<em>List Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_VALUE_STYLE_FEATURE_COUNT = DATA_TYPE_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl <em>Int Value
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getIntValueStyle()
 	 * @generated
@@ -2337,18 +2384,18 @@
 	int INT_VALUE_STYLE = 42;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Int Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Int Value</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2356,17 +2403,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Int Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl <em>Int
+	 * List Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getIntListValueStyle()
 	 * @generated
@@ -2374,36 +2422,38 @@
 	int INT_LIST_VALUE_STYLE = 43;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Int List Value</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Int List Value</b></em>' attribute list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INT_LIST_VALUE_STYLE__INT_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Int List Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Int List Value Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl
+	 * <em>Boolean Value Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBooleanValueStyle()
 	 * @generated
@@ -2411,36 +2461,37 @@
 	int BOOLEAN_VALUE_STYLE = 44;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOOLEAN_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Boolean Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Boolean Value</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Boolean Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Boolean Value Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOOLEAN_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl <em>Double
+	 * Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDoubleValueStyle()
 	 * @generated
@@ -2448,18 +2499,18 @@
 	int DOUBLE_VALUE_STYLE = 45;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOUBLE_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Double Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Double Value</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2467,17 +2518,19 @@
 
 	/**
 	 * The number of structural features of the '<em>Double Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOUBLE_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl
+	 * <em>Double List Value Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDoubleListValueStyle()
 	 * @generated
@@ -2485,9 +2538,9 @@
 	int DOUBLE_LIST_VALUE_STYLE = 46;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2495,26 +2548,27 @@
 
 	/**
 	 * The feature id for the '<em><b>Double List Value</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Double List Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Double List Value Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOUBLE_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl <em>String Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl <em>String
+	 * Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStringValueStyle()
 	 * @generated
@@ -2522,18 +2576,18 @@
 	int STRING_VALUE_STYLE = 47;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STRING_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>String Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>String Value</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2541,17 +2595,19 @@
 
 	/**
 	 * The number of structural features of the '<em>String Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STRING_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl
+	 * <em>String List Value Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStringListValueStyle()
 	 * @generated
@@ -2559,9 +2615,9 @@
 	int STRING_LIST_VALUE_STYLE = 48;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2569,26 +2625,28 @@
 
 	/**
 	 * The feature id for the '<em><b>String List Value</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>String List Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>String List Value Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STRING_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl <em>EObject Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl
+	 * <em>EObject Value Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getEObjectValueStyle()
 	 * @generated
@@ -2596,36 +2654,38 @@
 	int EOBJECT_VALUE_STYLE = 49;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EOBJECT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>EObject Value</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EObject Value</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EOBJECT_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>EObject Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>EObject Value Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EOBJECT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl <em>EObject List Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl
+	 * <em>EObject List Value Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getEObjectListValueStyle()
 	 * @generated
@@ -2633,9 +2693,9 @@
 	int EOBJECT_LIST_VALUE_STYLE = 50;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2643,26 +2703,28 @@
 
 	/**
 	 * The feature id for the '<em><b>EObject List Value</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>EObject List Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>EObject List Value Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EOBJECT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl <em>Byte Array Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl
+	 * <em>Byte Array Value Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getByteArrayValueStyle()
 	 * @generated
@@ -2670,36 +2732,38 @@
 	int BYTE_ARRAY_VALUE_STYLE = 51;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BYTE_ARRAY_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Byte Array Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Byte Array Value</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Byte Array Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Byte Array Value Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BYTE_ARRAY_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl
+	 * <em>Boolean List Value Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBooleanListValueStyle()
 	 * @generated
@@ -2707,9 +2771,9 @@
 	int BOOLEAN_LIST_VALUE_STYLE = 52;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2717,26 +2781,28 @@
 
 	/**
 	 * The feature id for the '<em><b>Boolean List Value</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Boolean List Value Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Boolean List Value Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOOLEAN_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl <em>Diagram Link Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl
+	 * <em>Diagram Link Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDiagramLinkStyle()
 	 * @generated
@@ -2744,9 +2810,9 @@
 	int DIAGRAM_LINK_STYLE = 54;
 
 	/**
-	 * The feature id for the '<em><b>Diagram Link</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram Link</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2754,17 +2820,19 @@
 
 	/**
 	 * The number of structural features of the '<em>Diagram Link Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIAGRAM_LINK_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl <em>Hinted Diagram Link Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl
+	 * <em>Hinted Diagram Link Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getHintedDiagramLinkStyle()
 	 * @generated
@@ -2772,36 +2840,38 @@
 	int HINTED_DIAGRAM_LINK_STYLE = 53;
 
 	/**
-	 * The feature id for the '<em><b>Diagram Link</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram Link</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK = DIAGRAM_LINK_STYLE__DIAGRAM_LINK;
 
 	/**
-	 * The feature id for the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hint</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HINTED_DIAGRAM_LINK_STYLE__HINT = DIAGRAM_LINK_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Hinted Diagram Link Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Hinted Diagram Link Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HINTED_DIAGRAM_LINK_STYLE_FEATURE_COUNT = DIAGRAM_LINK_STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl <em>Multi Diagram Link Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl
+	 * <em>Multi Diagram Link Style</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getMultiDiagramLinkStyle()
 	 * @generated
@@ -2809,27 +2879,28 @@
 	int MULTI_DIAGRAM_LINK_STYLE = 55;
 
 	/**
-	 * The feature id for the '<em><b>Diagram Links</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram Links</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Multi Diagram Link Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Multi Diagram Link Style</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MULTI_DIAGRAM_LINK_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.TextStyleImpl <em>Text Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.TextStyleImpl <em>Text
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.TextStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getTextStyle()
 	 * @generated
@@ -2837,27 +2908,28 @@
 	int TEXT_STYLE = 56;
 
 	/**
-	 * The feature id for the '<em><b>Text Alignment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Text Alignment</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT_STYLE__TEXT_ALIGNMENT = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Text Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Text Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl <em>Line Type Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl <em>Line Type
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLineTypeStyle()
 	 * @generated
@@ -2865,9 +2937,9 @@
 	int LINE_TYPE_STYLE = 57;
 
 	/**
-	 * The feature id for the '<em><b>Line Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Type</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2875,17 +2947,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Line Type Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LINE_TYPE_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl <em>Arrow Style</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl <em>Arrow
+	 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getArrowStyle()
 	 * @generated
@@ -2893,36 +2966,37 @@
 	int ARROW_STYLE = 58;
 
 	/**
-	 * The feature id for the '<em><b>Arrow Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Arrow Source</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ARROW_STYLE__ARROW_SOURCE = STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Arrow Target</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Arrow Target</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ARROW_STYLE__ARROW_TARGET = STYLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Arrow Style</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Arrow Style</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ARROW_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl <em>Shape</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl <em>Shape</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ShapeImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getShape()
 	 * @generated
@@ -2930,63 +3004,63 @@
 	int SHAPE = 59;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__EANNOTATIONS = NODE__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__VISIBLE = NODE__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__TYPE = NODE__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__MUTABLE = NODE__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__SOURCE_EDGES = NODE__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__TARGET_EDGES = NODE__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2994,160 +3068,160 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__STYLES = NODE__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__ELEMENT = NODE__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__DIAGRAM = NODE__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__TRANSIENT_CHILDREN = NODE__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__LAYOUT_CONSTRAINT = NODE__LAYOUT_CONSTRAINT;
 
 	/**
-	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__FONT_COLOR = NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__FONT_NAME = NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__FONT_HEIGHT = NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Bold</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Bold</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__BOLD = NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Italic</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Italic</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__ITALIC = NODE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Underline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Underline</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__UNDERLINE = NODE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__STRIKE_THROUGH = NODE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Description</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__DESCRIPTION = NODE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Fill Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Fill Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__FILL_COLOR = NODE_FEATURE_COUNT + 8;
 	/**
-	 * The feature id for the '<em><b>Transparency</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transparency</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__TRANSPARENCY = NODE_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Gradient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Gradient</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__GRADIENT = NODE_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__LINE_COLOR = NODE_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3155,26 +3229,27 @@
 
 	/**
 	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE__ROUNDED_BENDPOINTS_RADIUS = NODE_FEATURE_COUNT + 13;
 
 	/**
-	 * The number of structural features of the '<em>Shape</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Shape</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SHAPE_FEATURE_COUNT = NODE_FEATURE_COUNT + 14;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.CompartmentImpl <em>Compartment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.CompartmentImpl
+	 * <em>Compartment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.CompartmentImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getCompartment()
 	 * @generated
@@ -3182,9 +3257,10 @@
 	int COMPARTMENT = 60;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl <em>List Compartment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl <em>List
+	 * Compartment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getListCompartment()
 	 * @generated
@@ -3192,9 +3268,10 @@
 	int LIST_COMPARTMENT = 61;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl <em>Connector</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl
+	 * <em>Connector</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.ConnectorImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getConnector()
 	 * @generated
@@ -3202,9 +3279,11 @@
 	int CONNECTOR = 62;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl <em>Standard Diagram</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl
+	 * <em>Standard Diagram</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStandardDiagram()
 	 * @generated
@@ -3212,9 +3291,11 @@
 	int STANDARD_DIAGRAM = 63;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.BasicDecorationNodeImpl <em>Basic Decoration Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.BasicDecorationNodeImpl
+	 * <em>Basic Decoration Node</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.BasicDecorationNodeImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBasicDecorationNode()
 	 * @generated
@@ -3222,63 +3303,63 @@
 	int BASIC_DECORATION_NODE = 65;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__EANNOTATIONS = NODE__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__VISIBLE = NODE__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__TYPE = NODE__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__MUTABLE = NODE__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__SOURCE_EDGES = NODE__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__TARGET_EDGES = NODE__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3286,62 +3367,64 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__STYLES = NODE__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__ELEMENT = NODE__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__DIAGRAM = NODE__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__TRANSIENT_CHILDREN = NODE__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT = NODE__LAYOUT_CONSTRAINT;
 
 	/**
-	 * The number of structural features of the '<em>Basic Decoration Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Basic Decoration Node</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_DECORATION_NODE_FEATURE_COUNT = NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.DecorationNodeImpl <em>Decoration Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.DecorationNodeImpl
+	 * <em>Decoration Node</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.DecorationNodeImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDecorationNode()
 	 * @generated
@@ -3349,63 +3432,63 @@
 	int DECORATION_NODE = 64;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__EANNOTATIONS = BASIC_DECORATION_NODE__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__VISIBLE = BASIC_DECORATION_NODE__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__TYPE = BASIC_DECORATION_NODE__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__MUTABLE = BASIC_DECORATION_NODE__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__SOURCE_EDGES = BASIC_DECORATION_NODE__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__TARGET_EDGES = BASIC_DECORATION_NODE__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3413,44 +3496,44 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__STYLES = BASIC_DECORATION_NODE__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__ELEMENT = BASIC_DECORATION_NODE__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__DIAGRAM = BASIC_DECORATION_NODE__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE__TRANSIENT_CHILDREN = BASIC_DECORATION_NODE__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3458,17 +3541,18 @@
 
 	/**
 	 * The number of structural features of the '<em>Decoration Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DECORATION_NODE_FEATURE_COUNT = BASIC_DECORATION_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl <em>Basic Compartment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl <em>Basic
+	 * Compartment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBasicCompartment()
 	 * @generated
@@ -3476,63 +3560,63 @@
 	int BASIC_COMPARTMENT = 66;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__EANNOTATIONS = DECORATION_NODE__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__VISIBLE = DECORATION_NODE__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__TYPE = DECORATION_NODE__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__MUTABLE = DECORATION_NODE__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__SOURCE_EDGES = DECORATION_NODE__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__TARGET_EDGES = DECORATION_NODE__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3540,53 +3624,53 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__STYLES = DECORATION_NODE__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__ELEMENT = DECORATION_NODE__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__DIAGRAM = DECORATION_NODE__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__TRANSIENT_CHILDREN = DECORATION_NODE__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT__LAYOUT_CONSTRAINT = DECORATION_NODE__LAYOUT_CONSTRAINT;
 
 	/**
-	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Collapsed</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3594,71 +3678,71 @@
 
 	/**
 	 * The number of structural features of the '<em>Basic Compartment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_COMPARTMENT_FEATURE_COUNT = DECORATION_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__EANNOTATIONS = BASIC_COMPARTMENT__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__VISIBLE = BASIC_COMPARTMENT__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__TYPE = BASIC_COMPARTMENT__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__MUTABLE = BASIC_COMPARTMENT__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__SOURCE_EDGES = BASIC_COMPARTMENT__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__TARGET_EDGES = BASIC_COMPARTMENT__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3666,143 +3750,143 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__STYLES = BASIC_COMPARTMENT__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__ELEMENT = BASIC_COMPARTMENT__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__DIAGRAM = BASIC_COMPARTMENT__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__TRANSIENT_CHILDREN = BASIC_COMPARTMENT__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__LAYOUT_CONSTRAINT = BASIC_COMPARTMENT__LAYOUT_CONSTRAINT;
 
 	/**
-	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Collapsed</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__COLLAPSED = BASIC_COMPARTMENT__COLLAPSED;
 
 	/**
-	 * The feature id for the '<em><b>Canonical</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Canonical</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__CANONICAL = BASIC_COMPARTMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Show Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Show Title</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT__SHOW_TITLE = BASIC_COMPARTMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Compartment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Compartment</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPARTMENT_FEATURE_COUNT = BASIC_COMPARTMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__EANNOTATIONS = BASIC_COMPARTMENT__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__VISIBLE = BASIC_COMPARTMENT__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__TYPE = BASIC_COMPARTMENT__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__MUTABLE = BASIC_COMPARTMENT__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__SOURCE_EDGES = BASIC_COMPARTMENT__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__TARGET_EDGES = BASIC_COMPARTMENT__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3810,98 +3894,98 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__STYLES = BASIC_COMPARTMENT__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__ELEMENT = BASIC_COMPARTMENT__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__DIAGRAM = BASIC_COMPARTMENT__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__TRANSIENT_CHILDREN = BASIC_COMPARTMENT__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__LAYOUT_CONSTRAINT = BASIC_COMPARTMENT__LAYOUT_CONSTRAINT;
 
 	/**
-	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Collapsed</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__COLLAPSED = BASIC_COMPARTMENT__COLLAPSED;
 
 	/**
-	 * The feature id for the '<em><b>Sorting</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorting</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__SORTING = BASIC_COMPARTMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sorting Keys</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorting Keys</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__SORTING_KEYS = BASIC_COMPARTMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Sorted Objects</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorted Objects</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__SORTED_OBJECTS = BASIC_COMPARTMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Filtering</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filtering</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__FILTERING = BASIC_COMPARTMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Filtering Keys</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filtering Keys</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3909,17 +3993,17 @@
 
 	/**
 	 * The feature id for the '<em><b>Filtered Objects</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT__FILTERED_OBJECTS = BASIC_COMPARTMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Show Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Show Title</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3927,71 +4011,71 @@
 
 	/**
 	 * The number of structural features of the '<em>List Compartment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIST_COMPARTMENT_FEATURE_COUNT = BASIC_COMPARTMENT_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__EANNOTATIONS = EDGE__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__VISIBLE = EDGE__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__TYPE = EDGE__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__MUTABLE = EDGE__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__SOURCE_EDGES = EDGE__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__TARGET_EDGES = EDGE__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3999,53 +4083,53 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__STYLES = EDGE__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__ELEMENT = EDGE__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__DIAGRAM = EDGE__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__TRANSIENT_CHILDREN = EDGE__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__SOURCE = EDGE__SOURCE;
 
 	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4053,8 +4137,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Bendpoints</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4062,8 +4146,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Source Anchor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4071,8 +4155,8 @@
 
 	/**
 	 * The feature id for the '<em><b>Target Anchor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4080,161 +4164,161 @@
 
 	/**
 	 * The feature id for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__ROUNDED_BENDPOINTS_RADIUS = EDGE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Routing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Routing</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__ROUTING = EDGE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Smoothness</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Smoothness</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__SMOOTHNESS = EDGE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Avoid Obstructions</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Avoid Obstructions</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__AVOID_OBSTRUCTIONS = EDGE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Closest Distance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Closest Distance</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__CLOSEST_DISTANCE = EDGE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Jump Link Status</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Link Status</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__JUMP_LINK_STATUS = EDGE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Jump Link Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Link Type</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__JUMP_LINK_TYPE = EDGE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Jump Links Reverse</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Jump Links Reverse</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__JUMP_LINKS_REVERSE = EDGE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Line Color</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Color</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__LINE_COLOR = EDGE_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Line Width</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR__LINE_WIDTH = EDGE_FEATURE_COUNT + 9;
 
 	/**
-	 * The number of structural features of the '<em>Connector</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Connector</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONNECTOR_FEATURE_COUNT = EDGE_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__EANNOTATIONS = DIAGRAM__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__VISIBLE = DIAGRAM__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__TYPE = DIAGRAM__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__MUTABLE = DIAGRAM__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__SOURCE_EDGES = DIAGRAM__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__TARGET_EDGES = DIAGRAM__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4242,134 +4326,134 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__STYLES = DIAGRAM__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__ELEMENT = DIAGRAM__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__DIAGRAM = DIAGRAM__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__TRANSIENT_CHILDREN = DIAGRAM__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__NAME = DIAGRAM__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Measurement Unit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Measurement Unit</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__MEASUREMENT_UNIT = DIAGRAM__MEASUREMENT_UNIT;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Edges</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Edges</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__PERSISTED_EDGES = DIAGRAM__PERSISTED_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Transient Edges</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Edges</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__TRANSIENT_EDGES = DIAGRAM__TRANSIENT_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Page X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page X</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__PAGE_X = DIAGRAM_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Page Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Y</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__PAGE_Y = DIAGRAM_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Page Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Width</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__PAGE_WIDTH = DIAGRAM_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Page Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Page Height</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__PAGE_HEIGHT = DIAGRAM_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Horizontal Guides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Horizontal Guides</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__HORIZONTAL_GUIDES = DIAGRAM_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Vertical Guides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Vertical Guides</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM__VERTICAL_GUIDES = DIAGRAM_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Description</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4377,17 +4461,19 @@
 
 	/**
 	 * The number of structural features of the '<em>Standard Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STANDARD_DIAGRAM_FEATURE_COUNT = DIAGRAM_FEATURE_COUNT + 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl <em>Basic Semantic Compartment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl
+	 * <em>Basic Semantic Compartment</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBasicSemanticCompartment()
 	 * @generated
@@ -4395,63 +4481,63 @@
 	int BASIC_SEMANTIC_COMPARTMENT = 67;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS = BASIC_DECORATION_NODE__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__VISIBLE = BASIC_DECORATION_NODE__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__TYPE = BASIC_DECORATION_NODE__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__MUTABLE = BASIC_DECORATION_NODE__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES = BASIC_DECORATION_NODE__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES = BASIC_DECORATION_NODE__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4459,71 +4545,73 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__STYLES = BASIC_DECORATION_NODE__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__ELEMENT = BASIC_DECORATION_NODE__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__DIAGRAM = BASIC_DECORATION_NODE__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN = BASIC_DECORATION_NODE__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT = BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT;
 
 	/**
-	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Collapsed</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT__COLLAPSED = BASIC_DECORATION_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Basic Semantic Compartment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Basic Semantic
+	 * Compartment</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BASIC_SEMANTIC_COMPARTMENT_FEATURE_COUNT = BASIC_DECORATION_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl <em>Semantic List Compartment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl
+	 * <em>Semantic List Compartment</em>}' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSemanticListCompartment()
 	 * @generated
@@ -4531,63 +4619,63 @@
 	int SEMANTIC_LIST_COMPARTMENT = 68;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS = BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS;
 
 	/**
-	 * The feature id for the '<em><b>Visible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visible</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__VISIBLE = BASIC_SEMANTIC_COMPARTMENT__VISIBLE;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__TYPE = BASIC_SEMANTIC_COMPARTMENT__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__MUTABLE = BASIC_SEMANTIC_COMPARTMENT__MUTABLE;
 
 	/**
-	 * The feature id for the '<em><b>Source Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Source Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES = BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Target Edges</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Edges</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES = BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES;
 
 	/**
-	 * The feature id for the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4595,98 +4683,98 @@
 
 	/**
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__STYLES = BASIC_SEMANTIC_COMPARTMENT__STYLES;
 
 	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__ELEMENT = BASIC_SEMANTIC_COMPARTMENT__ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__DIAGRAM = BASIC_SEMANTIC_COMPARTMENT__DIAGRAM;
 
 	/**
-	 * The feature id for the '<em><b>Transient Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient Children</b></em>' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN = BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Layout Constraint</b></em>' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT = BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT;
 
 	/**
-	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Collapsed</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__COLLAPSED = BASIC_SEMANTIC_COMPARTMENT__COLLAPSED;
 
 	/**
-	 * The feature id for the '<em><b>Sorting</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorting</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__SORTING = BASIC_SEMANTIC_COMPARTMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sorting Keys</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorting Keys</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS = BASIC_SEMANTIC_COMPARTMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Sorted Objects</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sorted Objects</b></em>' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS = BASIC_SEMANTIC_COMPARTMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Filtering</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filtering</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__FILTERING = BASIC_SEMANTIC_COMPARTMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Filtering Keys</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filtering Keys</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4694,35 +4782,35 @@
 
 	/**
 	 * The feature id for the '<em><b>Filtered Objects</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS = BASIC_SEMANTIC_COMPARTMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Show Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Show Title</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE = BASIC_SEMANTIC_COMPARTMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the '<em>Semantic List Compartment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Semantic List Compartment</em>'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SEMANTIC_LIST_COMPARTMENT_FEATURE_COUNT = BASIC_SEMANTIC_COMPARTMENT_FEATURE_COUNT + 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Sorting <em>Sorting</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Sorting
+	 * <em>Sorting</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.Sorting
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSorting()
 	 * @generated
@@ -4730,9 +4818,9 @@
 	int SORTING = 70;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Filtering <em>Filtering</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Filtering
+	 * <em>Filtering</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.Filtering
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFiltering()
 	 * @generated
@@ -4740,9 +4828,9 @@
 	int FILTERING = 71;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Routing <em>Routing</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Routing
+	 * <em>Routing</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.Routing
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRouting()
 	 * @generated
@@ -4750,9 +4838,10 @@
 	int ROUTING = 72;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Smoothness <em>Smoothness</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.Smoothness <em>Smoothness</em>}'
+	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.Smoothness
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSmoothness()
 	 * @generated
@@ -4760,9 +4849,10 @@
 	int SMOOTHNESS = 73;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.JumpLinkStatus <em>Jump Link Status</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.JumpLinkStatus <em>Jump Link
+	 * Status</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.JumpLinkStatus
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getJumpLinkStatus()
 	 * @generated
@@ -4770,9 +4860,10 @@
 	int JUMP_LINK_STATUS = 74;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.JumpLinkType <em>Jump Link Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.JumpLinkType <em>Jump Link
+	 * Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.JumpLinkType
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getJumpLinkType()
 	 * @generated
@@ -4780,9 +4871,9 @@
 	int JUMP_LINK_TYPE = 75;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Alignment <em>Alignment</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.Alignment
+	 * <em>Alignment</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.Alignment
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getAlignment()
 	 * @generated
@@ -4790,9 +4881,10 @@
 	int ALIGNMENT = 76;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.SortingDirection <em>Sorting Direction</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingDirection <em>Sorting
+	 * Direction</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.SortingDirection
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSortingDirection()
 	 * @generated
@@ -4800,9 +4892,10 @@
 	int SORTING_DIRECTION = 77;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.MeasurementUnit <em>Measurement Unit</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.MeasurementUnit <em>Measurement
+	 * Unit</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.MeasurementUnit
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getMeasurementUnit()
 	 * @generated
@@ -4810,9 +4903,10 @@
 	int MEASUREMENT_UNIT = 78;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.TextAlignment <em>Text Alignment</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.TextAlignment <em>Text
+	 * Alignment</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.TextAlignment
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getTextAlignment()
 	 * @generated
@@ -4820,9 +4914,9 @@
 	int TEXT_ALIGNMENT = 79;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.LineType <em>Line Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.LineType
+	 * <em>Line Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.LineType
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLineType()
 	 * @generated
@@ -4830,9 +4924,9 @@
 	int LINE_TYPE = 80;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.ArrowType <em>Arrow Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.ArrowType
+	 * <em>Arrow Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.ArrowType
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getArrowType()
 	 * @generated
@@ -4840,9 +4934,10 @@
 	int ARROW_TYPE = 81;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.GradientStyle <em>Gradient Style</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the
+	 * '{@link org.eclipse.gmf.runtime.notation.GradientStyle <em>Gradient
+	 * Style</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.GradientStyle
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getGradientStyle()
 	 * @generated
@@ -4850,9 +4945,9 @@
 	int GRADIENT_STYLE = 82;
 
 	/**
-	 * The meta object id for the '<em>Relative Bendpoint List</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Relative Bendpoint List</em>' data type. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.List
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRelativeBendpointList()
 	 * @generated
@@ -4860,9 +4955,9 @@
 	int RELATIVE_BENDPOINT_LIST = 83;
 
 	/**
-	 * The meta object id for the '<em>Filter Key List</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Filter Key List</em>' data type. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.List
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFilterKeyList()
 	 * @generated
@@ -4870,31 +4965,30 @@
 	int FILTER_KEY_LIST = 84;
 
 	/**
-	 * The meta object id for the '<em>Sort Key Map</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Sort Key Map</em>' data type. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see java.util.Map
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSortKeyMap()
 	 * @generated
 	 */
 	int SORT_KEY_MAP = 85;
 
-
 	/**
-	 * The meta object id for the '<em>Gradient Data</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Gradient Data</em>' data type. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.gmf.runtime.notation.datatype.GradientData
 	 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getGradientData()
 	 * @generated
 	 */
 	int GRADIENT_DATA = 86;
 
-
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Edge <em>Edge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge <em>Edge</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Edge</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Edge
 	 * @generated
@@ -4902,9 +4996,10 @@
 	EClass getEdge();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.runtime.notation.Edge#getSource <em>Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getSource <em>Source</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Source</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Edge#getSource()
 	 * @see #getEdge()
@@ -4913,9 +5008,10 @@
 	EReference getEdge_Source();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.runtime.notation.Edge#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Edge#getTarget()
 	 * @see #getEdge()
@@ -4924,9 +5020,10 @@
 	EReference getEdge_Target();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.runtime.notation.Edge#getBendpoints <em>Bendpoints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getBendpoints
+	 * <em>Bendpoints</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Bendpoints</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Edge#getBendpoints()
 	 * @see #getEdge()
@@ -4935,10 +5032,12 @@
 	EReference getEdge_Bendpoints();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.runtime.notation.Edge#getSourceAnchor <em>Source Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Source Anchor</em>'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getSourceAnchor <em>Source
+	 * Anchor</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Source
+	 *         Anchor</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Edge#getSourceAnchor()
 	 * @see #getEdge()
 	 * @generated
@@ -4946,10 +5045,12 @@
 	EReference getEdge_SourceAnchor();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.runtime.notation.Edge#getTargetAnchor <em>Target Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Target Anchor</em>'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getTargetAnchor <em>Target
+	 * Anchor</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Target
+	 *         Anchor</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Edge#getTargetAnchor()
 	 * @see #getEdge()
 	 * @generated
@@ -4957,9 +5058,10 @@
 	EReference getEdge_TargetAnchor();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Node <em>Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Node <em>Node</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Node</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Node
 	 * @generated
@@ -4967,10 +5069,12 @@
 	EClass getNode();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.runtime.notation.Node#getLayoutConstraint <em>Layout Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Layout Constraint</em>'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.gmf.runtime.notation.Node#getLayoutConstraint <em>Layout
+	 * Constraint</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Layout
+	 *         Constraint</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Node#getLayoutConstraint()
 	 * @see #getNode()
 	 * @generated
@@ -4978,9 +5082,10 @@
 	EReference getNode_LayoutConstraint();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Style
 	 * @generated
@@ -4988,9 +5093,10 @@
 	EClass getStyle();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.FillStyle <em>Fill Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.FillStyle <em>Fill Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Fill Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FillStyle
 	 * @generated
@@ -4998,9 +5104,10 @@
 	EClass getFillStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor <em>Fill Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor <em>Fill
+	 * Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Fill Color</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FillStyle#getFillColor()
 	 * @see #getFillStyle()
@@ -5009,9 +5116,10 @@
 	EAttribute getFillStyle_FillColor();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FillStyle#getTransparency <em>Transparency</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FillStyle#getTransparency
+	 * <em>Transparency</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Transparency</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FillStyle#getTransparency()
 	 * @see #getFillStyle()
@@ -5020,9 +5128,10 @@
 	EAttribute getFillStyle_Transparency();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FillStyle#getGradient <em>Gradient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FillStyle#getGradient
+	 * <em>Gradient</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Gradient</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FillStyle#getGradient()
 	 * @see #getFillStyle()
@@ -5031,9 +5140,10 @@
 	EAttribute getFillStyle_Gradient();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.LineStyle <em>Line Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.LineStyle <em>Line Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Line Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.LineStyle
 	 * @generated
@@ -5041,9 +5151,10 @@
 	EClass getLineStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineColor <em>Line Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineColor <em>Line
+	 * Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Line Color</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.LineStyle#getLineColor()
 	 * @see #getLineStyle()
@@ -5052,9 +5163,10 @@
 	EAttribute getLineStyle_LineColor();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineWidth <em>Line Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineWidth <em>Line
+	 * Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Line Width</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.LineStyle#getLineWidth()
 	 * @see #getLineStyle()
@@ -5063,9 +5175,10 @@
 	EAttribute getLineStyle_LineWidth();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.FontStyle <em>Font Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle <em>Font Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Font Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle
 	 * @generated
@@ -5073,9 +5186,10 @@
 	EClass getFontStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontColor <em>Font Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontColor <em>Font
+	 * Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Color</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle#getFontColor()
 	 * @see #getFontStyle()
@@ -5084,9 +5198,10 @@
 	EAttribute getFontStyle_FontColor();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontName <em>Font Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontName <em>Font
+	 * Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Name</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle#getFontName()
 	 * @see #getFontStyle()
@@ -5095,9 +5210,10 @@
 	EAttribute getFontStyle_FontName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontHeight <em>Font Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontHeight <em>Font
+	 * Height</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Height</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle#getFontHeight()
 	 * @see #getFontStyle()
@@ -5106,9 +5222,10 @@
 	EAttribute getFontStyle_FontHeight();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FontStyle#isBold <em>Bold</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#isBold <em>Bold</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Bold</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle#isBold()
 	 * @see #getFontStyle()
@@ -5117,9 +5234,10 @@
 	EAttribute getFontStyle_Bold();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FontStyle#isItalic <em>Italic</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#isItalic
+	 * <em>Italic</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Italic</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle#isItalic()
 	 * @see #getFontStyle()
@@ -5128,9 +5246,10 @@
 	EAttribute getFontStyle_Italic();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FontStyle#isUnderline <em>Underline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#isUnderline
+	 * <em>Underline</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Underline</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle#isUnderline()
 	 * @see #getFontStyle()
@@ -5139,9 +5258,10 @@
 	EAttribute getFontStyle_Underline();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FontStyle#isStrikeThrough <em>Strike Through</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle#isStrikeThrough <em>Strike
+	 * Through</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Strike Through</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle#isStrikeThrough()
 	 * @see #getFontStyle()
@@ -5150,9 +5270,10 @@
 	EAttribute getFontStyle_StrikeThrough();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.TitleStyle <em>Title Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.TitleStyle <em>Title Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Title Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.TitleStyle
 	 * @generated
@@ -5160,9 +5281,10 @@
 	EClass getTitleStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.TitleStyle#isShowTitle <em>Show Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.TitleStyle#isShowTitle <em>Show
+	 * Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Show Title</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.TitleStyle#isShowTitle()
 	 * @see #getTitleStyle()
@@ -5171,9 +5293,10 @@
 	EAttribute getTitleStyle_ShowTitle();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.SortingStyle <em>Sorting Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingStyle <em>Sorting
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Sorting Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.SortingStyle
 	 * @generated
@@ -5181,9 +5304,10 @@
 	EClass getSortingStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSorting <em>Sorting</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSorting
+	 * <em>Sorting</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Sorting</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.SortingStyle#getSorting()
 	 * @see #getSortingStyle()
@@ -5192,9 +5316,10 @@
 	EAttribute getSortingStyle_Sorting();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortingKeys <em>Sorting Keys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortingKeys
+	 * <em>Sorting Keys</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Sorting Keys</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.SortingStyle#getSortingKeys()
 	 * @see #getSortingStyle()
@@ -5203,9 +5328,10 @@
 	EAttribute getSortingStyle_SortingKeys();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortedObjects <em>Sorted Objects</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortedObjects
+	 * <em>Sorted Objects</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Sorted Objects</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.SortingStyle#getSortedObjects()
 	 * @see #getSortingStyle()
@@ -5214,9 +5340,10 @@
 	EReference getSortingStyle_SortedObjects();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle <em>Description Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle <em>Description
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Description Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DescriptionStyle
 	 * @generated
@@ -5224,9 +5351,10 @@
 	EClass getDescriptionStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle#getDescription
+	 * <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Description</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DescriptionStyle#getDescription()
 	 * @see #getDescriptionStyle()
@@ -5235,9 +5363,10 @@
 	EAttribute getDescriptionStyle_Description();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.LayoutConstraint <em>Layout Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.LayoutConstraint <em>Layout
+	 * Constraint</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Layout Constraint</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.LayoutConstraint
 	 * @generated
@@ -5245,9 +5374,10 @@
 	EClass getLayoutConstraint();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Size <em>Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Size <em>Size</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Size</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Size
 	 * @generated
@@ -5255,9 +5385,10 @@
 	EClass getSize();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Size#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Size#getWidth <em>Width</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Width</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Size#getWidth()
 	 * @see #getSize()
@@ -5266,9 +5397,10 @@
 	EAttribute getSize_Width();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Size#getHeight <em>Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Size#getHeight <em>Height</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Height</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Size#getHeight()
 	 * @see #getSize()
@@ -5277,9 +5409,10 @@
 	EAttribute getSize_Height();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Location <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Location <em>Location</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Location</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Location
 	 * @generated
@@ -5287,9 +5420,10 @@
 	EClass getLocation();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Location#getX <em>X</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Location#getX <em>X</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>X</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Location#getX()
 	 * @see #getLocation()
@@ -5298,9 +5432,10 @@
 	EAttribute getLocation_X();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Location#getY <em>Y</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Location#getY <em>Y</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Y</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Location#getY()
 	 * @see #getLocation()
@@ -5309,9 +5444,10 @@
 	EAttribute getLocation_Y();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Bounds <em>Bounds</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Bounds <em>Bounds</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Bounds</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Bounds
 	 * @generated
@@ -5319,9 +5455,10 @@
 	EClass getBounds();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Ratio <em>Ratio</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Ratio <em>Ratio</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Ratio</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Ratio
 	 * @generated
@@ -5329,9 +5466,10 @@
 	EClass getRatio();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Ratio#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Ratio#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Ratio#getValue()
 	 * @see #getRatio()
@@ -5340,9 +5478,10 @@
 	EAttribute getRatio_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Anchor <em>Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Anchor <em>Anchor</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Anchor</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Anchor
 	 * @generated
@@ -5350,9 +5489,10 @@
 	EClass getAnchor();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Bendpoints <em>Bendpoints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Bendpoints <em>Bendpoints</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Bendpoints</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Bendpoints
 	 * @generated
@@ -5360,9 +5500,10 @@
 	EClass getBendpoints();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.IdentityAnchor <em>Identity Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.IdentityAnchor <em>Identity
+	 * Anchor</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Identity Anchor</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.IdentityAnchor
 	 * @generated
@@ -5370,9 +5511,10 @@
 	EClass getIdentityAnchor();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.IdentityAnchor#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.IdentityAnchor#getId <em>Id</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.IdentityAnchor#getId()
 	 * @see #getIdentityAnchor()
@@ -5381,9 +5523,10 @@
 	EAttribute getIdentityAnchor_Id();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.RoutingStyle <em>Routing Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle <em>Routing
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Routing Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle
 	 * @generated
@@ -5391,9 +5534,10 @@
 	EClass getRoutingStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting <em>Routing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting
+	 * <em>Routing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Routing</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting()
 	 * @see #getRoutingStyle()
@@ -5402,9 +5546,10 @@
 	EAttribute getRoutingStyle_Routing();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness <em>Smoothness</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness
+	 * <em>Smoothness</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Smoothness</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness()
 	 * @see #getRoutingStyle()
@@ -5413,9 +5558,10 @@
 	EAttribute getRoutingStyle_Smoothness();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions <em>Avoid Obstructions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions
+	 * <em>Avoid Obstructions</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Avoid Obstructions</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions()
 	 * @see #getRoutingStyle()
@@ -5424,9 +5570,10 @@
 	EAttribute getRoutingStyle_AvoidObstructions();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance <em>Closest Distance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance
+	 * <em>Closest Distance</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Closest Distance</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance()
 	 * @see #getRoutingStyle()
@@ -5435,9 +5582,10 @@
 	EAttribute getRoutingStyle_ClosestDistance();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus <em>Jump Link Status</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus
+	 * <em>Jump Link Status</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Jump Link Status</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus()
 	 * @see #getRoutingStyle()
@@ -5446,9 +5594,10 @@
 	EAttribute getRoutingStyle_JumpLinkStatus();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType <em>Jump Link Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType
+	 * <em>Jump Link Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Jump Link Type</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType()
 	 * @see #getRoutingStyle()
@@ -5457,9 +5606,10 @@
 	EAttribute getRoutingStyle_JumpLinkType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse <em>Jump Links Reverse</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse
+	 * <em>Jump Links Reverse</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Jump Links Reverse</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse()
 	 * @see #getRoutingStyle()
@@ -5468,21 +5618,24 @@
 	EAttribute getRoutingStyle_JumpLinksReverse();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRoundedBendpointsRadius <em>Rounded Bendpoints Radius</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rounded Bendpoints Radius</em>'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRoundedBendpointsRadius
+	 * <em>Rounded Bendpoints Radius</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Rounded Bendpoints
+	 *         Radius</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle#getRoundedBendpointsRadius()
-	 * @see #getRoutingStyle()
-	 * Left in for backwards compatibility
+	 * @see #getRoutingStyle() Left in for backwards compatibility
 	 * @deprecated Use getRoundedCornersStyle_RoundedBendpointsRadius() instead
 	 */
 	EAttribute getRoutingStyle_RoundedBendpointsRadius();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.View <em>View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.View <em>View</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>View</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View
 	 * @generated
@@ -5490,9 +5643,10 @@
 	EClass getView();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.View#isVisible <em>Visible</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.View#isVisible <em>Visible</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Visible</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#isVisible()
 	 * @see #getView()
@@ -5501,9 +5655,10 @@
 	EAttribute getView_Visible();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.View#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getType <em>Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#getType()
 	 * @see #getView()
@@ -5512,9 +5667,10 @@
 	EAttribute getView_Type();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.View#isMutable <em>Mutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.View#isMutable <em>Mutable</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Mutable</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#isMutable()
 	 * @see #getView()
@@ -5523,9 +5679,10 @@
 	EAttribute getView_Mutable();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.gmf.runtime.notation.View#getSourceEdges <em>Source Edges</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getSourceEdges <em>Source
+	 * Edges</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Source Edges</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#getSourceEdges()
 	 * @see #getView()
@@ -5534,9 +5691,10 @@
 	EReference getView_SourceEdges();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.gmf.runtime.notation.View#getTargetEdges <em>Target Edges</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getTargetEdges <em>Target
+	 * Edges</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Target Edges</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#getTargetEdges()
 	 * @see #getView()
@@ -5545,10 +5703,12 @@
 	EReference getView_TargetEdges();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.runtime.notation.View#getPersistedChildren <em>Persisted Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persisted Children</em>'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getPersistedChildren
+	 * <em>Persisted Children</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Persisted
+	 *         Children</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#getPersistedChildren()
 	 * @see #getView()
 	 * @generated
@@ -5556,9 +5716,10 @@
 	EReference getView_PersistedChildren();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.runtime.notation.View#getStyles <em>Styles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getStyles <em>Styles</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Styles</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#getStyles()
 	 * @see #getView()
@@ -5567,9 +5728,10 @@
 	EReference getView_Styles();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Element</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#getElement()
 	 * @see #getView()
@@ -5578,9 +5740,10 @@
 	EReference getView_Element();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.runtime.notation.View#getDiagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getDiagram <em>Diagram</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Diagram</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#getDiagram()
 	 * @see #getView()
@@ -5589,10 +5752,12 @@
 	EReference getView_Diagram();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.runtime.notation.View#getTransientChildren <em>Transient Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Transient Children</em>'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getTransientChildren
+	 * <em>Transient Children</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Transient
+	 *         Children</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.View#getTransientChildren()
 	 * @see #getView()
 	 * @generated
@@ -5600,9 +5765,10 @@
 	EReference getView_TransientChildren();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints <em>Relative Bendpoints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints <em>Relative
+	 * Bendpoints</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Relative Bendpoints</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RelativeBendpoints
 	 * @generated
@@ -5610,9 +5776,10 @@
 	EClass getRelativeBendpoints();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints#getPoints <em>Points</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints#getPoints
+	 * <em>Points</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Points</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RelativeBendpoints#getPoints()
 	 * @see #getRelativeBendpoints()
@@ -5621,9 +5788,10 @@
 	EAttribute getRelativeBendpoints_Points();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Diagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram <em>Diagram</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Diagram</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Diagram
 	 * @generated
@@ -5631,9 +5799,10 @@
 	EClass getDiagram();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Diagram#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Diagram#getName()
 	 * @see #getDiagram()
@@ -5642,9 +5811,10 @@
 	EAttribute getDiagram_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit <em>Measurement Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit
+	 * <em>Measurement Unit</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Measurement Unit</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit()
 	 * @see #getDiagram()
@@ -5653,10 +5823,12 @@
 	EAttribute getDiagram_MeasurementUnit();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.runtime.notation.Diagram#getPersistedEdges <em>Persisted Edges</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Persisted Edges</em>'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram#getPersistedEdges
+	 * <em>Persisted Edges</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Persisted
+	 *         Edges</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Diagram#getPersistedEdges()
 	 * @see #getDiagram()
 	 * @generated
@@ -5664,10 +5836,12 @@
 	EReference getDiagram_PersistedEdges();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.runtime.notation.Diagram#getTransientEdges <em>Transient Edges</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Transient Edges</em>'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram#getTransientEdges
+	 * <em>Transient Edges</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Transient
+	 *         Edges</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Diagram#getTransientEdges()
 	 * @see #getDiagram()
 	 * @generated
@@ -5675,9 +5849,10 @@
 	EReference getDiagram_TransientEdges();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Image <em>Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Image <em>Image</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Image</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Image
 	 * @generated
@@ -5685,9 +5860,10 @@
 	EClass getImage();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Image#getData <em>Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Image#getData <em>Data</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Data</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Image#getData()
 	 * @see #getImage()
@@ -5696,9 +5872,10 @@
 	EAttribute getImage_Data();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle <em>Canonical Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle <em>Canonical
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Canonical Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.CanonicalStyle
 	 * @generated
@@ -5706,9 +5883,10 @@
 	EClass getCanonicalStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle#isCanonical <em>Canonical</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle#isCanonical
+	 * <em>Canonical</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Canonical</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.CanonicalStyle#isCanonical()
 	 * @see #getCanonicalStyle()
@@ -5717,9 +5895,10 @@
 	EAttribute getCanonicalStyle_Canonical();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.ShapeStyle <em>Shape Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.ShapeStyle <em>Shape Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Shape Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ShapeStyle
 	 * @generated
@@ -5727,9 +5906,10 @@
 	EClass getShapeStyle();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.ConnectorStyle <em>Connector Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.ConnectorStyle <em>Connector
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Connector Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ConnectorStyle
 	 * @generated
@@ -5737,9 +5917,10 @@
 	EClass getConnectorStyle();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.PageStyle <em>Page Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle <em>Page Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Page Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PageStyle
 	 * @generated
@@ -5747,9 +5928,10 @@
 	EClass getPageStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageX <em>Page X</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageX <em>Page
+	 * X</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Page X</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PageStyle#getPageX()
 	 * @see #getPageStyle()
@@ -5758,9 +5940,10 @@
 	EAttribute getPageStyle_PageX();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageY <em>Page Y</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageY <em>Page
+	 * Y</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Page Y</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PageStyle#getPageY()
 	 * @see #getPageStyle()
@@ -5769,9 +5952,10 @@
 	EAttribute getPageStyle_PageY();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageWidth <em>Page Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageWidth <em>Page
+	 * Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Page Width</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PageStyle#getPageWidth()
 	 * @see #getPageStyle()
@@ -5780,9 +5964,10 @@
 	EAttribute getPageStyle_PageWidth();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageHeight <em>Page Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageHeight <em>Page
+	 * Height</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Page Height</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PageStyle#getPageHeight()
 	 * @see #getPageStyle()
@@ -5791,9 +5976,10 @@
 	EAttribute getPageStyle_PageHeight();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.DrawerStyle <em>Drawer Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.DrawerStyle <em>Drawer Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Drawer Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DrawerStyle
 	 * @generated
@@ -5801,9 +5987,10 @@
 	EClass getDrawerStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.DrawerStyle#isCollapsed <em>Collapsed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.DrawerStyle#isCollapsed
+	 * <em>Collapsed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Collapsed</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DrawerStyle#isCollapsed()
 	 * @see #getDrawerStyle()
@@ -5812,9 +5999,10 @@
 	EAttribute getDrawerStyle_Collapsed();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.GuideStyle <em>Guide Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.GuideStyle <em>Guide Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Guide Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.GuideStyle
 	 * @generated
@@ -5822,10 +6010,12 @@
 	EClass getGuideStyle();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.runtime.notation.GuideStyle#getHorizontalGuides <em>Horizontal Guides</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Horizontal Guides</em>'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.GuideStyle#getHorizontalGuides
+	 * <em>Horizontal Guides</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Horizontal
+	 *         Guides</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.GuideStyle#getHorizontalGuides()
 	 * @see #getGuideStyle()
 	 * @generated
@@ -5833,10 +6023,12 @@
 	EReference getGuideStyle_HorizontalGuides();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.runtime.notation.GuideStyle#getVerticalGuides <em>Vertical Guides</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Vertical Guides</em>'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.GuideStyle#getVerticalGuides
+	 * <em>Vertical Guides</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Vertical
+	 *         Guides</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.GuideStyle#getVerticalGuides()
 	 * @see #getGuideStyle()
 	 * @generated
@@ -5844,9 +6036,10 @@
 	EReference getGuideStyle_VerticalGuides();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Guide <em>Guide</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Guide <em>Guide</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Guide</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Guide
 	 * @generated
@@ -5854,9 +6047,10 @@
 	EClass getGuide();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Guide#getPosition <em>Position</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.Guide#getPosition
+	 * <em>Position</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Position</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Guide#getPosition()
 	 * @see #getGuide()
@@ -5865,9 +6059,10 @@
 	EAttribute getGuide_Position();
 
 	/**
-	 * Returns the meta object for the map '{@link org.eclipse.gmf.runtime.notation.Guide#getNodeMap <em>Node Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the map
+	 * '{@link org.eclipse.gmf.runtime.notation.Guide#getNodeMap <em>Node
+	 * Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the map '<em>Node Map</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Guide#getNodeMap()
 	 * @see #getGuide()
@@ -5876,22 +6071,22 @@
 	EReference getGuide_NodeMap();
 
 	/**
-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Node Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Node
+	 * Entry</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Node Entry</em>'.
 	 * @see java.util.Map.Entry
-	 * @model features="value key" 
-	 *        valueDefault="Center" valueDataType="org.eclipse.gmf.runtime.notation.Alignment"
+	 * @model features="value key" valueDefault="Center"
+	 *        valueDataType="org.eclipse.gmf.runtime.notation.Alignment"
 	 *        keyType="org.eclipse.gmf.runtime.notation.Node" keyRequired="true"
 	 * @generated
 	 */
 	EClass getNodeEntry();
 
 	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link java.util.Map.Entry
+	 * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getNodeEntry()
@@ -5900,9 +6095,9 @@
 	EAttribute getNodeEntry_Value();
 
 	/**
-	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link java.util.Map.Entry
+	 * <em>Key</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Key</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getNodeEntry()
@@ -5911,9 +6106,10 @@
 	EReference getNodeEntry_Key();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.FilteringStyle <em>Filtering Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.FilteringStyle <em>Filtering
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Filtering Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FilteringStyle
 	 * @generated
@@ -5921,9 +6117,10 @@
 	EClass getFilteringStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFiltering <em>Filtering</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFiltering
+	 * <em>Filtering</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Filtering</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FilteringStyle#getFiltering()
 	 * @see #getFilteringStyle()
@@ -5932,9 +6129,10 @@
 	EAttribute getFilteringStyle_Filtering();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteringKeys <em>Filtering Keys</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteringKeys
+	 * <em>Filtering Keys</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Filtering Keys</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteringKeys()
 	 * @see #getFilteringStyle()
@@ -5943,9 +6141,10 @@
 	EAttribute getFilteringStyle_FilteringKeys();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteredObjects <em>Filtered Objects</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteredObjects
+	 * <em>Filtered Objects</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Filtered Objects</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.FilteringStyle#getFilteredObjects()
 	 * @see #getFilteringStyle()
@@ -5954,9 +6153,10 @@
 	EReference getFilteringStyle_FilteredObjects();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.DiagramStyle <em>Diagram Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.DiagramStyle <em>Diagram
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Diagram Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DiagramStyle
 	 * @generated
@@ -5964,9 +6164,10 @@
 	EClass getDiagramStyle();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.ImageStyle <em>Image Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageStyle <em>Image Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Image Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ImageStyle
 	 * @generated
@@ -5974,9 +6175,10 @@
 	EClass getImageStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getAntiAlias <em>Anti Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getAntiAlias <em>Anti
+	 * Alias</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Anti Alias</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ImageStyle#getAntiAlias()
 	 * @see #getImageStyle()
@@ -5985,9 +6187,11 @@
 	EAttribute getImageStyle_AntiAlias();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getMaintainAspectRatio <em>Maintain Aspect Ratio</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getMaintainAspectRatio
+	 * <em>Maintain Aspect Ratio</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the meta object for the attribute '<em>Maintain Aspect Ratio</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ImageStyle#getMaintainAspectRatio()
 	 * @see #getImageStyle()
@@ -5996,9 +6200,10 @@
 	EAttribute getImageStyle_MaintainAspectRatio();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getCropBound <em>Crop Bound</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageStyle#getCropBound <em>Crop
+	 * Bound</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Crop Bound</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ImageStyle#getCropBound()
 	 * @see #getImageStyle()
@@ -6007,9 +6212,10 @@
 	EReference getImageStyle_CropBound();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle <em>Image Buffer Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle <em>Image Buffer
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Image Buffer Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ImageBufferStyle
 	 * @generated
@@ -6017,10 +6223,12 @@
 	EClass getImageBufferStyle();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle#getImageBuffer <em>Image Buffer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Image Buffer</em>'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle#getImageBuffer
+	 * <em>Image Buffer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Image
+	 *         Buffer</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ImageBufferStyle#getImageBuffer()
 	 * @see #getImageBufferStyle()
 	 * @generated
@@ -6028,9 +6236,10 @@
 	EReference getImageBufferStyle_ImageBuffer();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle <em>Properties Set Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle <em>Properties
+	 * Set Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Properties Set Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PropertiesSetStyle
 	 * @generated
@@ -6038,9 +6247,10 @@
 	EClass getPropertiesSetStyle();
 
 	/**
-	 * Returns the meta object for the map '{@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle#getPropertiesMap <em>Properties Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the map
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle#getPropertiesMap
+	 * <em>Properties Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the map '<em>Properties Map</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PropertiesSetStyle#getPropertiesMap()
 	 * @see #getPropertiesSetStyle()
@@ -6049,21 +6259,24 @@
 	EReference getPropertiesSetStyle_PropertiesMap();
 
 	/**
-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Property Value Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>String To Property Value Map Entry</em>'.
+	 * Returns the meta object for class '{@link java.util.Map.Entry <em>String To
+	 * Property Value Map Entry</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @return the meta object for class '<em>String To Property Value Map
+	 *         Entry</em>'.
 	 * @see java.util.Map.Entry
 	 * @model keyDataType="org.eclipse.emf.ecore.EString"
-	 *        valueType="org.eclipse.gmf.runtime.notation.PropertyValue" valueContainment="true"
+	 *        valueType="org.eclipse.gmf.runtime.notation.PropertyValue"
+	 *        valueContainment="true"
 	 * @generated
 	 */
 	EClass getStringToPropertyValueMapEntry();
 
 	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link java.util.Map.Entry
+	 * <em>Key</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Key</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getStringToPropertyValueMapEntry()
@@ -6072,9 +6285,10 @@
 	EAttribute getStringToPropertyValueMapEntry_Key();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Value</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getStringToPropertyValueMapEntry()
@@ -6083,9 +6297,10 @@
 	EReference getStringToPropertyValueMapEntry_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.PropertyValue <em>Property Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertyValue <em>Property
+	 * Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Property Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PropertyValue
 	 * @generated
@@ -6093,9 +6308,10 @@
 	EClass getPropertyValue();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.PropertyValue#getRawValue <em>Raw Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertyValue#getRawValue <em>Raw
+	 * Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Raw Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PropertyValue#getRawValue()
 	 * @see #getPropertyValue()
@@ -6104,9 +6320,10 @@
 	EAttribute getPropertyValue_RawValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.runtime.notation.PropertyValue#getInstanceType <em>Instance Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertyValue#getInstanceType
+	 * <em>Instance Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Instance Type</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.PropertyValue#getInstanceType()
 	 * @see #getPropertyValue()
@@ -6115,9 +6332,10 @@
 	EReference getPropertyValue_InstanceType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.SingleValueStyle <em>Single Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.SingleValueStyle <em>Single Value
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Single Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.SingleValueStyle
 	 * @generated
@@ -6125,9 +6343,10 @@
 	EClass getSingleValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.SingleValueStyle#getRawValue <em>Raw Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.SingleValueStyle#getRawValue <em>Raw
+	 * Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Raw Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.SingleValueStyle#getRawValue()
 	 * @see #getSingleValueStyle()
@@ -6136,9 +6355,10 @@
 	EAttribute getSingleValueStyle_RawValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.ListValueStyle <em>List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.ListValueStyle <em>List Value
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>List Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ListValueStyle
 	 * @generated
@@ -6146,9 +6366,10 @@
 	EClass getListValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.gmf.runtime.notation.ListValueStyle#getRawValuesList <em>Raw Values List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list
+	 * '{@link org.eclipse.gmf.runtime.notation.ListValueStyle#getRawValuesList
+	 * <em>Raw Values List</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Raw Values List</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ListValueStyle#getRawValuesList()
 	 * @see #getListValueStyle()
@@ -6157,9 +6378,10 @@
 	EAttribute getListValueStyle_RawValuesList();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.NamedStyle <em>Named Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.NamedStyle <em>Named Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Named Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.NamedStyle
 	 * @generated
@@ -6167,9 +6389,10 @@
 	EClass getNamedStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.NamedStyle#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.NamedStyle#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.NamedStyle#getName()
 	 * @see #getNamedStyle()
@@ -6178,9 +6401,10 @@
 	EAttribute getNamedStyle_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.StringObjectConverter <em>String Object Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.StringObjectConverter <em>String
+	 * Object Converter</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>String Object Converter</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.StringObjectConverter
 	 * @generated
@@ -6188,9 +6412,10 @@
 	EClass getStringObjectConverter();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.DataTypeStyle <em>Data Type Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.DataTypeStyle <em>Data Type
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Data Type Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DataTypeStyle
 	 * @generated
@@ -6198,9 +6423,10 @@
 	EClass getDataTypeStyle();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.runtime.notation.DataTypeStyle#getInstanceType <em>Instance Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.gmf.runtime.notation.DataTypeStyle#getInstanceType
+	 * <em>Instance Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Instance Type</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DataTypeStyle#getInstanceType()
 	 * @see #getDataTypeStyle()
@@ -6209,9 +6435,10 @@
 	EReference getDataTypeStyle_InstanceType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.IntValueStyle <em>Int Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.IntValueStyle <em>Int Value
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Int Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.IntValueStyle
 	 * @generated
@@ -6219,9 +6446,10 @@
 	EClass getIntValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.IntValueStyle#getIntValue <em>Int Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.IntValueStyle#getIntValue <em>Int
+	 * Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Int Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.IntValueStyle#getIntValue()
 	 * @see #getIntValueStyle()
@@ -6230,9 +6458,10 @@
 	EAttribute getIntValueStyle_IntValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.IntListValueStyle <em>Int List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.IntListValueStyle <em>Int List Value
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Int List Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.IntListValueStyle
 	 * @generated
@@ -6240,9 +6469,10 @@
 	EClass getIntListValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.gmf.runtime.notation.IntListValueStyle#getIntListValue <em>Int List Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list
+	 * '{@link org.eclipse.gmf.runtime.notation.IntListValueStyle#getIntListValue
+	 * <em>Int List Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Int List Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.IntListValueStyle#getIntListValue()
 	 * @see #getIntListValueStyle()
@@ -6251,9 +6481,10 @@
 	EAttribute getIntListValueStyle_IntListValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle <em>Boolean Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle <em>Boolean Value
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Boolean Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.BooleanValueStyle
 	 * @generated
@@ -6261,9 +6492,10 @@
 	EClass getBooleanValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle#isBooleanValue
+	 * <em>Boolean Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Boolean Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.BooleanValueStyle#isBooleanValue()
 	 * @see #getBooleanValueStyle()
@@ -6272,9 +6504,10 @@
 	EAttribute getBooleanValueStyle_BooleanValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle <em>Double Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle <em>Double Value
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Double Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DoubleValueStyle
 	 * @generated
@@ -6282,9 +6515,10 @@
 	EClass getDoubleValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle#getDoubleValue <em>Double Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle#getDoubleValue
+	 * <em>Double Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Double Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DoubleValueStyle#getDoubleValue()
 	 * @see #getDoubleValueStyle()
@@ -6293,9 +6527,10 @@
 	EAttribute getDoubleValueStyle_DoubleValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle <em>Double List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle <em>Double List
+	 * Value Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Double List Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DoubleListValueStyle
 	 * @generated
@@ -6303,9 +6538,10 @@
 	EClass getDoubleListValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list
+	 * '{@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle#getDoubleListValue
+	 * <em>Double List Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Double List Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DoubleListValueStyle#getDoubleListValue()
 	 * @see #getDoubleListValueStyle()
@@ -6314,9 +6550,10 @@
 	EAttribute getDoubleListValueStyle_DoubleListValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.StringValueStyle <em>String Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.StringValueStyle <em>String Value
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>String Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.StringValueStyle
 	 * @generated
@@ -6324,9 +6561,10 @@
 	EClass getStringValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.StringValueStyle#getStringValue <em>String Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.StringValueStyle#getStringValue
+	 * <em>String Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>String Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.StringValueStyle#getStringValue()
 	 * @see #getStringValueStyle()
@@ -6335,9 +6573,10 @@
 	EAttribute getStringValueStyle_StringValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.StringListValueStyle <em>String List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.StringListValueStyle <em>String List
+	 * Value Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>String List Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.StringListValueStyle
 	 * @generated
@@ -6345,9 +6584,10 @@
 	EClass getStringListValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.gmf.runtime.notation.StringListValueStyle#getStringListValue <em>String List Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list
+	 * '{@link org.eclipse.gmf.runtime.notation.StringListValueStyle#getStringListValue
+	 * <em>String List Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>String List Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.StringListValueStyle#getStringListValue()
 	 * @see #getStringListValueStyle()
@@ -6356,9 +6596,10 @@
 	EAttribute getStringListValueStyle_StringListValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle <em>EObject Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle <em>EObject Value
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EObject Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.EObjectValueStyle
 	 * @generated
@@ -6366,9 +6607,10 @@
 	EClass getEObjectValueStyle();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle#getEObjectValue
+	 * <em>EObject Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>EObject Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.EObjectValueStyle#getEObjectValue()
 	 * @see #getEObjectValueStyle()
@@ -6377,9 +6619,10 @@
 	EReference getEObjectValueStyle_EObjectValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle <em>EObject List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle <em>EObject
+	 * List Value Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EObject List Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.EObjectListValueStyle
 	 * @generated
@@ -6387,9 +6630,10 @@
 	EClass getEObjectListValueStyle();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle#getEObjectListValue <em>EObject List Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle#getEObjectListValue
+	 * <em>EObject List Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>EObject List Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.EObjectListValueStyle#getEObjectListValue()
 	 * @see #getEObjectListValueStyle()
@@ -6398,9 +6642,10 @@
 	EReference getEObjectListValueStyle_EObjectListValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle <em>Byte Array Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle <em>Byte Array
+	 * Value Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Byte Array Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ByteArrayValueStyle
 	 * @generated
@@ -6408,9 +6653,10 @@
 	EClass getByteArrayValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle#getByteArrayValue <em>Byte Array Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle#getByteArrayValue
+	 * <em>Byte Array Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Byte Array Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ByteArrayValueStyle#getByteArrayValue()
 	 * @see #getByteArrayValueStyle()
@@ -6419,9 +6665,10 @@
 	EAttribute getByteArrayValueStyle_ByteArrayValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle <em>Boolean List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle <em>Boolean
+	 * List Value Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Boolean List Value Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.BooleanListValueStyle
 	 * @generated
@@ -6429,9 +6676,10 @@
 	EClass getBooleanListValueStyle();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list
+	 * '{@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle#getBooleanListValue
+	 * <em>Boolean List Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Boolean List Value</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.BooleanListValueStyle#getBooleanListValue()
 	 * @see #getBooleanListValueStyle()
@@ -6440,9 +6688,10 @@
 	EAttribute getBooleanListValueStyle_BooleanListValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle <em>Hinted Diagram Link Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle <em>Hinted
+	 * Diagram Link Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hinted Diagram Link Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle
 	 * @generated
@@ -6450,9 +6699,10 @@
 	EClass getHintedDiagramLinkStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle#getHint <em>Hint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle#getHint
+	 * <em>Hint</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Hint</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle#getHint()
 	 * @see #getHintedDiagramLinkStyle()
@@ -6461,9 +6711,10 @@
 	EAttribute getHintedDiagramLinkStyle_Hint();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle <em>Diagram Link Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle <em>Diagram Link
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Diagram Link Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DiagramLinkStyle
 	 * @generated
@@ -6471,9 +6722,10 @@
 	EClass getDiagramLinkStyle();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle#getDiagramLink <em>Diagram Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle#getDiagramLink
+	 * <em>Diagram Link</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Diagram Link</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DiagramLinkStyle#getDiagramLink()
 	 * @see #getDiagramLinkStyle()
@@ -6482,9 +6734,10 @@
 	EReference getDiagramLinkStyle_DiagramLink();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle <em>Multi Diagram Link Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle <em>Multi
+	 * Diagram Link Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Multi Diagram Link Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle
 	 * @generated
@@ -6492,9 +6745,10 @@
 	EClass getMultiDiagramLinkStyle();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle#getDiagramLinks <em>Diagram Links</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list
+	 * '{@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle#getDiagramLinks
+	 * <em>Diagram Links</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Diagram Links</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle#getDiagramLinks()
 	 * @see #getMultiDiagramLinkStyle()
@@ -6503,9 +6757,10 @@
 	EReference getMultiDiagramLinkStyle_DiagramLinks();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.TextStyle <em>Text Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.TextStyle <em>Text Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Text Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.TextStyle
 	 * @generated
@@ -6513,9 +6768,10 @@
 	EClass getTextStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.TextStyle#getTextAlignment <em>Text Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.TextStyle#getTextAlignment <em>Text
+	 * Alignment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Text Alignment</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.TextStyle#getTextAlignment()
 	 * @see #getTextStyle()
@@ -6524,9 +6780,10 @@
 	EAttribute getTextStyle_TextAlignment();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.LineTypeStyle <em>Line Type Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.LineTypeStyle <em>Line Type
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Line Type Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.LineTypeStyle
 	 * @generated
@@ -6534,9 +6791,10 @@
 	EClass getLineTypeStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.LineTypeStyle#getLineType <em>Line Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.LineTypeStyle#getLineType <em>Line
+	 * Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Line Type</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.LineTypeStyle#getLineType()
 	 * @see #getLineTypeStyle()
@@ -6545,9 +6803,10 @@
 	EAttribute getLineTypeStyle_LineType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.ArrowStyle <em>Arrow Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.ArrowStyle <em>Arrow Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Arrow Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowStyle
 	 * @generated
@@ -6555,9 +6814,10 @@
 	EClass getArrowStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowSource <em>Arrow Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowSource <em>Arrow
+	 * Source</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Arrow Source</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowSource()
 	 * @see #getArrowStyle()
@@ -6566,9 +6826,10 @@
 	EAttribute getArrowStyle_ArrowSource();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowTarget <em>Arrow Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowTarget <em>Arrow
+	 * Target</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Arrow Target</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowStyle#getArrowTarget()
 	 * @see #getArrowStyle()
@@ -6577,9 +6838,10 @@
 	EAttribute getArrowStyle_ArrowTarget();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Shape <em>Shape</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Shape <em>Shape</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Shape</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Shape
 	 * @generated
@@ -6587,9 +6849,10 @@
 	EClass getShape();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Compartment <em>Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Compartment <em>Compartment</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Compartment</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Compartment
 	 * @generated
@@ -6597,9 +6860,10 @@
 	EClass getCompartment();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.ListCompartment <em>List Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.ListCompartment <em>List
+	 * Compartment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>List Compartment</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ListCompartment
 	 * @generated
@@ -6607,9 +6871,10 @@
 	EClass getListCompartment();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.Connector <em>Connector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.Connector <em>Connector</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Connector</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Connector
 	 * @generated
@@ -6617,9 +6882,10 @@
 	EClass getConnector();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.StandardDiagram <em>Standard Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.StandardDiagram <em>Standard
+	 * Diagram</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Standard Diagram</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.StandardDiagram
 	 * @generated
@@ -6627,9 +6893,10 @@
 	EClass getStandardDiagram();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.DecorationNode <em>Decoration Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.DecorationNode <em>Decoration
+	 * Node</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Decoration Node</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.DecorationNode
 	 * @generated
@@ -6637,9 +6904,10 @@
 	EClass getDecorationNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.BasicDecorationNode <em>Basic Decoration Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.BasicDecorationNode <em>Basic
+	 * Decoration Node</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Basic Decoration Node</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.BasicDecorationNode
 	 * @generated
@@ -6647,9 +6915,10 @@
 	EClass getBasicDecorationNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.BasicCompartment <em>Basic Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.BasicCompartment <em>Basic
+	 * Compartment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Basic Compartment</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.BasicCompartment
 	 * @generated
@@ -6657,9 +6926,10 @@
 	EClass getBasicCompartment();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.BasicSemanticCompartment <em>Basic Semantic Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.BasicSemanticCompartment <em>Basic
+	 * Semantic Compartment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Basic Semantic Compartment</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.BasicSemanticCompartment
 	 * @generated
@@ -6667,9 +6937,10 @@
 	EClass getBasicSemanticCompartment();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.SemanticListCompartment <em>Semantic List Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.SemanticListCompartment <em>Semantic
+	 * List Compartment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Semantic List Compartment</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.SemanticListCompartment
 	 * @generated
@@ -6677,9 +6948,10 @@
 	EClass getSemanticListCompartment();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle <em>Rounded Corners Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle <em>Rounded
+	 * Corners Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Rounded Corners Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoundedCornersStyle
 	 * @generated
@@ -6687,10 +6959,13 @@
 	EClass getRoundedCornersStyle();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle#getRoundedBendpointsRadius <em>Rounded Bendpoints Radius</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Rounded Bendpoints Radius</em>'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle#getRoundedBendpointsRadius
+	 * <em>Rounded Bendpoints Radius</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Rounded Bendpoints
+	 *         Radius</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.RoundedCornersStyle#getRoundedBendpointsRadius()
 	 * @see #getRoundedCornersStyle()
 	 * @generated
@@ -6698,9 +6973,10 @@
 	EAttribute getRoundedCornersStyle_RoundedBendpointsRadius();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.Sorting <em>Sorting</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.Sorting <em>Sorting</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Sorting</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Sorting
 	 * @generated
@@ -6708,9 +6984,10 @@
 	EEnum getSorting();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.Filtering <em>Filtering</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.Filtering <em>Filtering</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Filtering</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Filtering
 	 * @generated
@@ -6718,9 +6995,10 @@
 	EEnum getFiltering();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.Routing <em>Routing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.Routing <em>Routing</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Routing</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Routing
 	 * @generated
@@ -6728,9 +7006,10 @@
 	EEnum getRouting();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.Smoothness <em>Smoothness</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.Smoothness <em>Smoothness</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Smoothness</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Smoothness
 	 * @generated
@@ -6738,9 +7017,10 @@
 	EEnum getSmoothness();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.JumpLinkStatus <em>Jump Link Status</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.JumpLinkStatus <em>Jump Link
+	 * Status</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Jump Link Status</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.JumpLinkStatus
 	 * @generated
@@ -6748,9 +7028,10 @@
 	EEnum getJumpLinkStatus();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.JumpLinkType <em>Jump Link Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.JumpLinkType <em>Jump Link
+	 * Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Jump Link Type</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.JumpLinkType
 	 * @generated
@@ -6758,9 +7039,10 @@
 	EEnum getJumpLinkType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.Alignment <em>Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.Alignment <em>Alignment</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Alignment</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.Alignment
 	 * @generated
@@ -6768,9 +7050,10 @@
 	EEnum getAlignment();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.SortingDirection <em>Sorting Direction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingDirection <em>Sorting
+	 * Direction</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Sorting Direction</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.SortingDirection
 	 * @generated
@@ -6778,9 +7061,10 @@
 	EEnum getSortingDirection();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.MeasurementUnit <em>Measurement Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.MeasurementUnit <em>Measurement
+	 * Unit</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Measurement Unit</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.MeasurementUnit
 	 * @generated
@@ -6788,9 +7072,10 @@
 	EEnum getMeasurementUnit();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.TextAlignment <em>Text Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.TextAlignment <em>Text
+	 * Alignment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Text Alignment</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.TextAlignment
 	 * @generated
@@ -6798,9 +7083,10 @@
 	EEnum getTextAlignment();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.LineType <em>Line Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.LineType <em>Line Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Line Type</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.LineType
 	 * @generated
@@ -6808,9 +7094,10 @@
 	EEnum getLineType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.ArrowType <em>Arrow Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.ArrowType <em>Arrow Type</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Arrow Type</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowType
 	 * @generated
@@ -6818,9 +7105,10 @@
 	EEnum getArrowType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.GradientStyle <em>Gradient Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum
+	 * '{@link org.eclipse.gmf.runtime.notation.GradientStyle <em>Gradient
+	 * Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Gradient Style</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.GradientStyle
 	 * @generated
@@ -6828,9 +7116,9 @@
 	EEnum getGradientStyle();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>Relative Bendpoint List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.List <em>Relative
+	 * Bendpoint List</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Relative Bendpoint List</em>'.
 	 * @see java.util.List
 	 * @model instanceClass="java.util.List"
@@ -6839,9 +7127,9 @@
 	EDataType getRelativeBendpointList();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>Filter Key List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.List <em>Filter Key
+	 * List</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Filter Key List</em>'.
 	 * @see java.util.List
 	 * @model instanceClass="java.util.List"
@@ -6850,9 +7138,9 @@
 	EDataType getFilterKeyList();
 
 	/**
-	 * Returns the meta object for data type '{@link java.util.Map <em>Sort Key Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.util.Map <em>Sort Key
+	 * Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Sort Key Map</em>'.
 	 * @see java.util.Map
 	 * @model instanceClass="java.util.Map"
@@ -6861,9 +7149,10 @@
 	EDataType getSortKeyMap();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.gmf.runtime.notation.datatype.GradientData <em>Gradient Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type
+	 * '{@link org.eclipse.gmf.runtime.notation.datatype.GradientData <em>Gradient
+	 * Data</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Gradient Data</em>'.
 	 * @see org.eclipse.gmf.runtime.notation.datatype.GradientData
 	 * @model instanceClass="org.eclipse.gmf.runtime.notation.datatype.GradientData"
@@ -6872,31 +7161,32 @@
 	EDataType getGradientData();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the factory that creates the instances of the model. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	NotationFactory getNotationFactory();
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
+	 * <!-- begin-user-doc --> Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl <em>Edge</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl <em>Edge</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.EdgeImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getEdge()
 		 * @generated
@@ -6905,48 +7195,49 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Source</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EDGE__SOURCE = eINSTANCE.getEdge_Source();
 
 		/**
 		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EDGE__TARGET = eINSTANCE.getEdge_Target();
 
 		/**
-		 * The meta object literal for the '<em><b>Bendpoints</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Bendpoints</b></em>' containment
+		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EDGE__BENDPOINTS = eINSTANCE.getEdge_Bendpoints();
 
 		/**
-		 * The meta object literal for the '<em><b>Source Anchor</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Source Anchor</b></em>' containment
+		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EDGE__SOURCE_ANCHOR = eINSTANCE.getEdge_SourceAnchor();
 
 		/**
-		 * The meta object literal for the '<em><b>Target Anchor</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Target Anchor</b></em>' containment
+		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EDGE__TARGET_ANCHOR = eINSTANCE.getEdge_TargetAnchor();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.NodeImpl <em>Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.NodeImpl <em>Node</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.NodeImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getNode()
 		 * @generated
@@ -6954,17 +7245,18 @@
 		EClass NODE = eINSTANCE.getNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Layout Constraint</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Layout Constraint</b></em>'
+		 * containment reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference NODE__LAYOUT_CONSTRAINT = eINSTANCE.getNode_LayoutConstraint();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}' class. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.Style
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStyle()
 		 * @generated
@@ -6972,9 +7264,10 @@
 		EClass STYLE = eINSTANCE.getStyle();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl <em>Fill Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl <em>Fill
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.FillStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFillStyle()
 		 * @generated
@@ -6982,33 +7275,34 @@
 		EClass FILL_STYLE = eINSTANCE.getFillStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Fill Color</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Fill Color</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILL_STYLE__FILL_COLOR = eINSTANCE.getFillStyle_FillColor();
 
 		/**
-		 * The meta object literal for the '<em><b>Transparency</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Transparency</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILL_STYLE__TRANSPARENCY = eINSTANCE.getFillStyle_Transparency();
 
 		/**
 		 * The meta object literal for the '<em><b>Gradient</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILL_STYLE__GRADIENT = eINSTANCE.getFillStyle_Gradient();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.LineStyleImpl <em>Line Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.LineStyleImpl <em>Line
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.LineStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLineStyle()
 		 * @generated
@@ -7016,25 +7310,26 @@
 		EClass LINE_STYLE = eINSTANCE.getLineStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Line Color</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Line Color</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LINE_STYLE__LINE_COLOR = eINSTANCE.getLineStyle_LineColor();
 
 		/**
-		 * The meta object literal for the '<em><b>Line Width</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Line Width</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LINE_STYLE__LINE_WIDTH = eINSTANCE.getLineStyle_LineWidth();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl <em>Font Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl <em>Font
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.FontStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFontStyle()
 		 * @generated
@@ -7042,65 +7337,66 @@
 		EClass FONT_STYLE = eINSTANCE.getFontStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Font Color</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Font Color</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FONT_STYLE__FONT_COLOR = eINSTANCE.getFontStyle_FontColor();
 
 		/**
-		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FONT_STYLE__FONT_NAME = eINSTANCE.getFontStyle_FontName();
 
 		/**
-		 * The meta object literal for the '<em><b>Font Height</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Font Height</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FONT_STYLE__FONT_HEIGHT = eINSTANCE.getFontStyle_FontHeight();
 
 		/**
 		 * The meta object literal for the '<em><b>Bold</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FONT_STYLE__BOLD = eINSTANCE.getFontStyle_Bold();
 
 		/**
 		 * The meta object literal for the '<em><b>Italic</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FONT_STYLE__ITALIC = eINSTANCE.getFontStyle_Italic();
 
 		/**
-		 * The meta object literal for the '<em><b>Underline</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Underline</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FONT_STYLE__UNDERLINE = eINSTANCE.getFontStyle_Underline();
 
 		/**
-		 * The meta object literal for the '<em><b>Strike Through</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Strike Through</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FONT_STYLE__STRIKE_THROUGH = eINSTANCE.getFontStyle_StrikeThrough();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl <em>Title Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl <em>Title
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getTitleStyle()
 		 * @generated
@@ -7108,17 +7404,18 @@
 		EClass TITLE_STYLE = eINSTANCE.getTitleStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Show Title</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Show Title</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TITLE_STYLE__SHOW_TITLE = eINSTANCE.getTitleStyle_ShowTitle();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl <em>Sorting Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl <em>Sorting
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSortingStyle()
 		 * @generated
@@ -7127,32 +7424,34 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Sorting</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SORTING_STYLE__SORTING = eINSTANCE.getSortingStyle_Sorting();
 
 		/**
-		 * The meta object literal for the '<em><b>Sorting Keys</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Sorting Keys</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SORTING_STYLE__SORTING_KEYS = eINSTANCE.getSortingStyle_SortingKeys();
 
 		/**
-		 * The meta object literal for the '<em><b>Sorted Objects</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Sorted Objects</b></em>' reference
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SORTING_STYLE__SORTED_OBJECTS = eINSTANCE.getSortingStyle_SortedObjects();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl <em>Description Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl
+		 * <em>Description Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDescriptionStyle()
 		 * @generated
@@ -7160,17 +7459,18 @@
 		EClass DESCRIPTION_STYLE = eINSTANCE.getDescriptionStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Description</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DESCRIPTION_STYLE__DESCRIPTION = eINSTANCE.getDescriptionStyle_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.LayoutConstraint <em>Layout Constraint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.LayoutConstraint <em>Layout
+		 * Constraint</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.LayoutConstraint
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLayoutConstraint()
 		 * @generated
@@ -7178,9 +7478,10 @@
 		EClass LAYOUT_CONSTRAINT = eINSTANCE.getLayoutConstraint();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.SizeImpl <em>Size</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.SizeImpl <em>Size</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.SizeImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSize()
 		 * @generated
@@ -7189,24 +7490,25 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SIZE__WIDTH = eINSTANCE.getSize_Width();
 
 		/**
 		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SIZE__HEIGHT = eINSTANCE.getSize_Height();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.LocationImpl <em>Location</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.LocationImpl
+		 * <em>Location</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.LocationImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLocation()
 		 * @generated
@@ -7214,25 +7516,26 @@
 		EClass LOCATION = eINSTANCE.getLocation();
 
 		/**
-		 * The meta object literal for the '<em><b>X</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>X</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LOCATION__X = eINSTANCE.getLocation_X();
 
 		/**
-		 * The meta object literal for the '<em><b>Y</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Y</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LOCATION__Y = eINSTANCE.getLocation_Y();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.BoundsImpl <em>Bounds</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.BoundsImpl <em>Bounds</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.BoundsImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBounds()
 		 * @generated
@@ -7240,9 +7543,10 @@
 		EClass BOUNDS = eINSTANCE.getBounds();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.RatioImpl <em>Ratio</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.RatioImpl <em>Ratio</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.RatioImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRatio()
 		 * @generated
@@ -7251,16 +7555,17 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute RATIO__VALUE = eINSTANCE.getRatio_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.Anchor <em>Anchor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.Anchor <em>Anchor</em>}' class. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.Anchor
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getAnchor()
 		 * @generated
@@ -7268,9 +7573,10 @@
 		EClass ANCHOR = eINSTANCE.getAnchor();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.Bendpoints <em>Bendpoints</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.Bendpoints <em>Bendpoints</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.Bendpoints
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBendpoints()
 		 * @generated
@@ -7278,9 +7584,10 @@
 		EClass BENDPOINTS = eINSTANCE.getBendpoints();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl <em>Identity Anchor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl <em>Identity
+		 * Anchor</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getIdentityAnchor()
 		 * @generated
@@ -7288,17 +7595,18 @@
 		EClass IDENTITY_ANCHOR = eINSTANCE.getIdentityAnchor();
 
 		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IDENTITY_ANCHOR__ID = eINSTANCE.getIdentityAnchor_Id();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl <em>Routing Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl <em>Routing
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRoutingStyle()
 		 * @generated
@@ -7307,65 +7615,65 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Routing</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROUTING_STYLE__ROUTING = eINSTANCE.getRoutingStyle_Routing();
 
 		/**
-		 * The meta object literal for the '<em><b>Smoothness</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Smoothness</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROUTING_STYLE__SMOOTHNESS = eINSTANCE.getRoutingStyle_Smoothness();
 
 		/**
-		 * The meta object literal for the '<em><b>Avoid Obstructions</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Avoid Obstructions</b></em>'
+		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROUTING_STYLE__AVOID_OBSTRUCTIONS = eINSTANCE.getRoutingStyle_AvoidObstructions();
 
 		/**
-		 * The meta object literal for the '<em><b>Closest Distance</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Closest Distance</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROUTING_STYLE__CLOSEST_DISTANCE = eINSTANCE.getRoutingStyle_ClosestDistance();
 
 		/**
-		 * The meta object literal for the '<em><b>Jump Link Status</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Jump Link Status</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROUTING_STYLE__JUMP_LINK_STATUS = eINSTANCE.getRoutingStyle_JumpLinkStatus();
 
 		/**
-		 * The meta object literal for the '<em><b>Jump Link Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Jump Link Type</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROUTING_STYLE__JUMP_LINK_TYPE = eINSTANCE.getRoutingStyle_JumpLinkType();
 
 		/**
-		 * The meta object literal for the '<em><b>Jump Links Reverse</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Jump Links Reverse</b></em>'
+		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROUTING_STYLE__JUMP_LINKS_REVERSE = eINSTANCE.getRoutingStyle_JumpLinksReverse();
 
 		/**
-
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl <em>View</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl <em>View</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ViewImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getView()
 		 * @generated
@@ -7374,88 +7682,92 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Visible</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute VIEW__VISIBLE = eINSTANCE.getView_Visible();
 
 		/**
 		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute VIEW__TYPE = eINSTANCE.getView_Type();
 
 		/**
 		 * The meta object literal for the '<em><b>Mutable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute VIEW__MUTABLE = eINSTANCE.getView_Mutable();
 
 		/**
-		 * The meta object literal for the '<em><b>Source Edges</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Source Edges</b></em>' reference list
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VIEW__SOURCE_EDGES = eINSTANCE.getView_SourceEdges();
 
 		/**
-		 * The meta object literal for the '<em><b>Target Edges</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Target Edges</b></em>' reference list
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VIEW__TARGET_EDGES = eINSTANCE.getView_TargetEdges();
 
 		/**
-		 * The meta object literal for the '<em><b>Persisted Children</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Persisted Children</b></em>'
+		 * containment reference list feature. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @generated
 		 */
 		EReference VIEW__PERSISTED_CHILDREN = eINSTANCE.getView_PersistedChildren();
 
 		/**
-		 * The meta object literal for the '<em><b>Styles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Styles</b></em>' containment
+		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VIEW__STYLES = eINSTANCE.getView_Styles();
 
 		/**
 		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VIEW__ELEMENT = eINSTANCE.getView_Element();
 
 		/**
 		 * The meta object literal for the '<em><b>Diagram</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VIEW__DIAGRAM = eINSTANCE.getView_Diagram();
 
 		/**
-		 * The meta object literal for the '<em><b>Transient Children</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Transient Children</b></em>'
+		 * containment reference list feature. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @generated
 		 */
 		EReference VIEW__TRANSIENT_CHILDREN = eINSTANCE.getView_TransientChildren();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl <em>Relative Bendpoints</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl
+		 * <em>Relative Bendpoints</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRelativeBendpoints()
 		 * @generated
@@ -7464,16 +7776,17 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Points</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute RELATIVE_BENDPOINTS__POINTS = eINSTANCE.getRelativeBendpoints_Points();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl <em>Diagram</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl <em>Diagram</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DiagramImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDiagram()
 		 * @generated
@@ -7482,40 +7795,41 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DIAGRAM__NAME = eINSTANCE.getDiagram_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Measurement Unit</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Measurement Unit</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DIAGRAM__MEASUREMENT_UNIT = eINSTANCE.getDiagram_MeasurementUnit();
 
 		/**
-		 * The meta object literal for the '<em><b>Persisted Edges</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Persisted Edges</b></em>' containment
+		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM__PERSISTED_EDGES = eINSTANCE.getDiagram_PersistedEdges();
 
 		/**
-		 * The meta object literal for the '<em><b>Transient Edges</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Transient Edges</b></em>' containment
+		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM__TRANSIENT_EDGES = eINSTANCE.getDiagram_TransientEdges();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ImageImpl <em>Image</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ImageImpl <em>Image</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ImageImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getImage()
 		 * @generated
@@ -7524,16 +7838,18 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Data</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IMAGE__DATA = eINSTANCE.getImage_Data();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl <em>Canonical Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl
+		 * <em>Canonical Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getCanonicalStyle()
 		 * @generated
@@ -7541,17 +7857,18 @@
 		EClass CANONICAL_STYLE = eINSTANCE.getCanonicalStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Canonical</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Canonical</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute CANONICAL_STYLE__CANONICAL = eINSTANCE.getCanonicalStyle_Canonical();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl <em>Shape Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl <em>Shape
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getShapeStyle()
 		 * @generated
@@ -7559,9 +7876,11 @@
 		EClass SHAPE_STYLE = eINSTANCE.getShapeStyle();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl <em>Connector Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl
+		 * <em>Connector Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getConnectorStyle()
 		 * @generated
@@ -7569,9 +7888,10 @@
 		EClass CONNECTOR_STYLE = eINSTANCE.getConnectorStyle();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl <em>Page Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl <em>Page
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.PageStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getPageStyle()
 		 * @generated
@@ -7580,40 +7900,41 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Page X</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PAGE_STYLE__PAGE_X = eINSTANCE.getPageStyle_PageX();
 
 		/**
 		 * The meta object literal for the '<em><b>Page Y</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PAGE_STYLE__PAGE_Y = eINSTANCE.getPageStyle_PageY();
 
 		/**
-		 * The meta object literal for the '<em><b>Page Width</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Page Width</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PAGE_STYLE__PAGE_WIDTH = eINSTANCE.getPageStyle_PageWidth();
 
 		/**
-		 * The meta object literal for the '<em><b>Page Height</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Page Height</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PAGE_STYLE__PAGE_HEIGHT = eINSTANCE.getPageStyle_PageHeight();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl <em>Drawer Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl <em>Drawer
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDrawerStyle()
 		 * @generated
@@ -7621,17 +7942,18 @@
 		EClass DRAWER_STYLE = eINSTANCE.getDrawerStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Collapsed</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Collapsed</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DRAWER_STYLE__COLLAPSED = eINSTANCE.getDrawerStyle_Collapsed();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl <em>Guide Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl <em>Guide
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getGuideStyle()
 		 * @generated
@@ -7639,25 +7961,27 @@
 		EClass GUIDE_STYLE = eINSTANCE.getGuideStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Horizontal Guides</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Horizontal Guides</b></em>'
+		 * containment reference list feature. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @generated
 		 */
 		EReference GUIDE_STYLE__HORIZONTAL_GUIDES = eINSTANCE.getGuideStyle_HorizontalGuides();
 
 		/**
-		 * The meta object literal for the '<em><b>Vertical Guides</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Vertical Guides</b></em>' containment
+		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GUIDE_STYLE__VERTICAL_GUIDES = eINSTANCE.getGuideStyle_VerticalGuides();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.GuideImpl <em>Guide</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.GuideImpl <em>Guide</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.GuideImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getGuide()
 		 * @generated
@@ -7666,24 +7990,25 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Position</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GUIDE__POSITION = eINSTANCE.getGuide_Position();
 
 		/**
-		 * The meta object literal for the '<em><b>Node Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Node Map</b></em>' map feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GUIDE__NODE_MAP = eINSTANCE.getGuide_NodeMap();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl <em>Node Entry</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl <em>Node
+		 * Entry</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getNodeEntry()
 		 * @generated
@@ -7692,24 +8017,26 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NODE_ENTRY__VALUE = eINSTANCE.getNodeEntry_Value();
 
 		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Key</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference NODE_ENTRY__KEY = eINSTANCE.getNodeEntry_Key();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl <em>Filtering Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl
+		 * <em>Filtering Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFilteringStyle()
 		 * @generated
@@ -7717,33 +8044,34 @@
 		EClass FILTERING_STYLE = eINSTANCE.getFilteringStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Filtering</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Filtering</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILTERING_STYLE__FILTERING = eINSTANCE.getFilteringStyle_Filtering();
 
 		/**
-		 * The meta object literal for the '<em><b>Filtering Keys</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Filtering Keys</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILTERING_STYLE__FILTERING_KEYS = eINSTANCE.getFilteringStyle_FilteringKeys();
 
 		/**
-		 * The meta object literal for the '<em><b>Filtered Objects</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Filtered Objects</b></em>' reference
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FILTERING_STYLE__FILTERED_OBJECTS = eINSTANCE.getFilteringStyle_FilteredObjects();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl <em>Diagram Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl <em>Diagram
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDiagramStyle()
 		 * @generated
@@ -7751,9 +8079,10 @@
 		EClass DIAGRAM_STYLE = eINSTANCE.getDiagramStyle();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl <em>Image Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl <em>Image
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getImageStyle()
 		 * @generated
@@ -7761,33 +8090,34 @@
 		EClass IMAGE_STYLE = eINSTANCE.getImageStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Anti Alias</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Anti Alias</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IMAGE_STYLE__ANTI_ALIAS = eINSTANCE.getImageStyle_AntiAlias();
 
 		/**
-		 * The meta object literal for the '<em><b>Maintain Aspect Ratio</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Maintain Aspect Ratio</b></em>'
+		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IMAGE_STYLE__MAINTAIN_ASPECT_RATIO = eINSTANCE.getImageStyle_MaintainAspectRatio();
 
 		/**
-		 * The meta object literal for the '<em><b>Crop Bound</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Crop Bound</b></em>' containment
+		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IMAGE_STYLE__CROP_BOUND = eINSTANCE.getImageStyle_CropBound();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl <em>Image Buffer Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl <em>Image
+		 * Buffer Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getImageBufferStyle()
 		 * @generated
@@ -7795,17 +8125,19 @@
 		EClass IMAGE_BUFFER_STYLE = eINSTANCE.getImageBufferStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Image Buffer</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Image Buffer</b></em>' containment
+		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IMAGE_BUFFER_STYLE__IMAGE_BUFFER = eINSTANCE.getImageBufferStyle_ImageBuffer();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl <em>Properties Set Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl
+		 * <em>Properties Set Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getPropertiesSetStyle()
 		 * @generated
@@ -7814,16 +8146,18 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Properties Map</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PROPERTIES_SET_STYLE__PROPERTIES_MAP = eINSTANCE.getPropertiesSetStyle_PropertiesMap();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl <em>String To Property Value Map Entry</em>}' class.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl
+		 * <em>String To Property Value Map Entry</em>}' class. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStringToPropertyValueMapEntry()
 		 * @generated
@@ -7831,25 +8165,26 @@
 		EClass STRING_TO_PROPERTY_VALUE_MAP_ENTRY = eINSTANCE.getStringToPropertyValueMapEntry();
 
 		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY = eINSTANCE.getStringToPropertyValueMapEntry_Key();
 
 		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Value</b></em>' containment reference
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE = eINSTANCE.getStringToPropertyValueMapEntry_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl <em>Property Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl <em>Property
+		 * Value</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getPropertyValue()
 		 * @generated
@@ -7857,25 +8192,26 @@
 		EClass PROPERTY_VALUE = eINSTANCE.getPropertyValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Raw Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Raw Value</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PROPERTY_VALUE__RAW_VALUE = eINSTANCE.getPropertyValue_RawValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Instance Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Instance Type</b></em>' reference
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PROPERTY_VALUE__INSTANCE_TYPE = eINSTANCE.getPropertyValue_InstanceType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl <em>Single Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl <em>Single
+		 * Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSingleValueStyle()
 		 * @generated
@@ -7883,17 +8219,18 @@
 		EClass SINGLE_VALUE_STYLE = eINSTANCE.getSingleValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Raw Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Raw Value</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SINGLE_VALUE_STYLE__RAW_VALUE = eINSTANCE.getSingleValueStyle_RawValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl <em>List Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl <em>List
+		 * Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getListValueStyle()
 		 * @generated
@@ -7901,17 +8238,18 @@
 		EClass LIST_VALUE_STYLE = eINSTANCE.getListValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Raw Values List</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Raw Values List</b></em>' attribute
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LIST_VALUE_STYLE__RAW_VALUES_LIST = eINSTANCE.getListValueStyle_RawValuesList();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl <em>Named Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl <em>Named
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getNamedStyle()
 		 * @generated
@@ -7920,16 +8258,17 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NAMED_STYLE__NAME = eINSTANCE.getNamedStyle_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.StringObjectConverter <em>String Object Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.StringObjectConverter <em>String
+		 * Object Converter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.StringObjectConverter
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStringObjectConverter()
 		 * @generated
@@ -7937,9 +8276,10 @@
 		EClass STRING_OBJECT_CONVERTER = eINSTANCE.getStringObjectConverter();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl <em>Data Type Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl <em>Data Type
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDataTypeStyle()
 		 * @generated
@@ -7947,17 +8287,18 @@
 		EClass DATA_TYPE_STYLE = eINSTANCE.getDataTypeStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Instance Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Instance Type</b></em>' reference
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DATA_TYPE_STYLE__INSTANCE_TYPE = eINSTANCE.getDataTypeStyle_InstanceType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl <em>Int Value
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getIntValueStyle()
 		 * @generated
@@ -7965,17 +8306,18 @@
 		EClass INT_VALUE_STYLE = eINSTANCE.getIntValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Int Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Int Value</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute INT_VALUE_STYLE__INT_VALUE = eINSTANCE.getIntValueStyle_IntValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl <em>Int
+		 * List Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getIntListValueStyle()
 		 * @generated
@@ -7983,17 +8325,19 @@
 		EClass INT_LIST_VALUE_STYLE = eINSTANCE.getIntListValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Int List Value</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Int List Value</b></em>' attribute
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute INT_LIST_VALUE_STYLE__INT_LIST_VALUE = eINSTANCE.getIntListValueStyle_IntListValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl
+		 * <em>Boolean Value Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBooleanValueStyle()
 		 * @generated
@@ -8001,17 +8345,18 @@
 		EClass BOOLEAN_VALUE_STYLE = eINSTANCE.getBooleanValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Boolean Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Boolean Value</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = eINSTANCE.getBooleanValueStyle_BooleanValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl <em>Double
+		 * Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDoubleValueStyle()
 		 * @generated
@@ -8019,17 +8364,19 @@
 		EClass DOUBLE_VALUE_STYLE = eINSTANCE.getDoubleValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Double Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Double Value</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DOUBLE_VALUE_STYLE__DOUBLE_VALUE = eINSTANCE.getDoubleValueStyle_DoubleValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl
+		 * <em>Double List Value Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDoubleListValueStyle()
 		 * @generated
@@ -8037,17 +8384,18 @@
 		EClass DOUBLE_LIST_VALUE_STYLE = eINSTANCE.getDoubleListValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Double List Value</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Double List Value</b></em>' attribute
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = eINSTANCE.getDoubleListValueStyle_DoubleListValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl <em>String Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl <em>String
+		 * Value Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStringValueStyle()
 		 * @generated
@@ -8055,17 +8403,19 @@
 		EClass STRING_VALUE_STYLE = eINSTANCE.getStringValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>String Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>String Value</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STRING_VALUE_STYLE__STRING_VALUE = eINSTANCE.getStringValueStyle_StringValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl
+		 * <em>String List Value Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStringListValueStyle()
 		 * @generated
@@ -8073,17 +8423,19 @@
 		EClass STRING_LIST_VALUE_STYLE = eINSTANCE.getStringListValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>String List Value</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>String List Value</b></em>' attribute
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = eINSTANCE.getStringListValueStyle_StringListValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl <em>EObject Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl
+		 * <em>EObject Value Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getEObjectValueStyle()
 		 * @generated
@@ -8091,17 +8443,19 @@
 		EClass EOBJECT_VALUE_STYLE = eINSTANCE.getEObjectValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>EObject Value</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>EObject Value</b></em>' reference
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EOBJECT_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectValueStyle_EObjectValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl <em>EObject List Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl
+		 * <em>EObject List Value Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getEObjectListValueStyle()
 		 * @generated
@@ -8109,17 +8463,19 @@
 		EClass EOBJECT_LIST_VALUE_STYLE = eINSTANCE.getEObjectListValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>EObject List Value</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>EObject List Value</b></em>'
+		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE = eINSTANCE.getEObjectListValueStyle_EObjectListValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl <em>Byte Array Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl
+		 * <em>Byte Array Value Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getByteArrayValueStyle()
 		 * @generated
@@ -8127,17 +8483,19 @@
 		EClass BYTE_ARRAY_VALUE_STYLE = eINSTANCE.getByteArrayValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Byte Array Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Byte Array Value</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE = eINSTANCE.getByteArrayValueStyle_ByteArrayValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl
+		 * <em>Boolean List Value Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBooleanListValueStyle()
 		 * @generated
@@ -8145,17 +8503,19 @@
 		EClass BOOLEAN_LIST_VALUE_STYLE = eINSTANCE.getBooleanListValueStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Boolean List Value</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Boolean List Value</b></em>'
+		 * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = eINSTANCE.getBooleanListValueStyle_BooleanListValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl <em>Hinted Diagram Link Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl
+		 * <em>Hinted Diagram Link Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getHintedDiagramLinkStyle()
 		 * @generated
@@ -8164,16 +8524,18 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Hint</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HINTED_DIAGRAM_LINK_STYLE__HINT = eINSTANCE.getHintedDiagramLinkStyle_Hint();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl <em>Diagram Link Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl
+		 * <em>Diagram Link Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDiagramLinkStyle()
 		 * @generated
@@ -8181,17 +8543,19 @@
 		EClass DIAGRAM_LINK_STYLE = eINSTANCE.getDiagramLinkStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Diagram Link</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Diagram Link</b></em>' reference
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM_LINK_STYLE__DIAGRAM_LINK = eINSTANCE.getDiagramLinkStyle_DiagramLink();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl <em>Multi Diagram Link Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl
+		 * <em>Multi Diagram Link Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getMultiDiagramLinkStyle()
 		 * @generated
@@ -8199,17 +8563,18 @@
 		EClass MULTI_DIAGRAM_LINK_STYLE = eINSTANCE.getMultiDiagramLinkStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Diagram Links</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Diagram Links</b></em>' reference
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS = eINSTANCE.getMultiDiagramLinkStyle_DiagramLinks();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.TextStyleImpl <em>Text Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.TextStyleImpl <em>Text
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.TextStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getTextStyle()
 		 * @generated
@@ -8217,17 +8582,18 @@
 		EClass TEXT_STYLE = eINSTANCE.getTextStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Text Alignment</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Text Alignment</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TEXT_STYLE__TEXT_ALIGNMENT = eINSTANCE.getTextStyle_TextAlignment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl <em>Line Type Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl <em>Line Type
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLineTypeStyle()
 		 * @generated
@@ -8235,17 +8601,18 @@
 		EClass LINE_TYPE_STYLE = eINSTANCE.getLineTypeStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Line Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Line Type</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LINE_TYPE_STYLE__LINE_TYPE = eINSTANCE.getLineTypeStyle_LineType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl <em>Arrow Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl <em>Arrow
+		 * Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getArrowStyle()
 		 * @generated
@@ -8253,25 +8620,26 @@
 		EClass ARROW_STYLE = eINSTANCE.getArrowStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Arrow Source</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Arrow Source</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ARROW_STYLE__ARROW_SOURCE = eINSTANCE.getArrowStyle_ArrowSource();
 
 		/**
-		 * The meta object literal for the '<em><b>Arrow Target</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Arrow Target</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ARROW_STYLE__ARROW_TARGET = eINSTANCE.getArrowStyle_ArrowTarget();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl <em>Shape</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl <em>Shape</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ShapeImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getShape()
 		 * @generated
@@ -8279,9 +8647,10 @@
 		EClass SHAPE = eINSTANCE.getShape();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.CompartmentImpl <em>Compartment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.CompartmentImpl
+		 * <em>Compartment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.CompartmentImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getCompartment()
 		 * @generated
@@ -8289,9 +8658,10 @@
 		EClass COMPARTMENT = eINSTANCE.getCompartment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl <em>List Compartment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl <em>List
+		 * Compartment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getListCompartment()
 		 * @generated
@@ -8299,9 +8669,10 @@
 		EClass LIST_COMPARTMENT = eINSTANCE.getListCompartment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl <em>Connector</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl
+		 * <em>Connector</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.ConnectorImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getConnector()
 		 * @generated
@@ -8309,9 +8680,11 @@
 		EClass CONNECTOR = eINSTANCE.getConnector();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl <em>Standard Diagram</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl
+		 * <em>Standard Diagram</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getStandardDiagram()
 		 * @generated
@@ -8319,9 +8692,11 @@
 		EClass STANDARD_DIAGRAM = eINSTANCE.getStandardDiagram();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.DecorationNodeImpl <em>Decoration Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.DecorationNodeImpl
+		 * <em>Decoration Node</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+		 * -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.DecorationNodeImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getDecorationNode()
 		 * @generated
@@ -8329,9 +8704,11 @@
 		EClass DECORATION_NODE = eINSTANCE.getDecorationNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.BasicDecorationNodeImpl <em>Basic Decoration Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.BasicDecorationNodeImpl
+		 * <em>Basic Decoration Node</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.BasicDecorationNodeImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBasicDecorationNode()
 		 * @generated
@@ -8339,9 +8716,10 @@
 		EClass BASIC_DECORATION_NODE = eINSTANCE.getBasicDecorationNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl <em>Basic Compartment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl <em>Basic
+		 * Compartment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBasicCompartment()
 		 * @generated
@@ -8349,9 +8727,11 @@
 		EClass BASIC_COMPARTMENT = eINSTANCE.getBasicCompartment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl <em>Basic Semantic Compartment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl
+		 * <em>Basic Semantic Compartment</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getBasicSemanticCompartment()
 		 * @generated
@@ -8359,9 +8739,11 @@
 		EClass BASIC_SEMANTIC_COMPARTMENT = eINSTANCE.getBasicSemanticCompartment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl <em>Semantic List Compartment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl
+		 * <em>Semantic List Compartment</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSemanticListCompartment()
 		 * @generated
@@ -8369,9 +8751,11 @@
 		EClass SEMANTIC_LIST_COMPARTMENT = eINSTANCE.getSemanticListCompartment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl <em>Rounded Corners Style</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl
+		 * <em>Rounded Corners Style</em>}' class. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRoundedCornersStyle()
 		 * @generated
@@ -8379,23 +8763,24 @@
 		EClass ROUNDED_CORNERS_STYLE = eINSTANCE.getRoundedCornersStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Rounded Bendpoints Radius</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Rounded Bendpoints Radius</b></em>'
+		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EAttribute ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS = eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius();
-		
-		
+		EAttribute ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS = eINSTANCE
+				.getRoundedCornersStyle_RoundedBendpointsRadius();
+
 		/**
-		 * @generated not For backwards compatibility 
+		 * @generated not For backwards compatibility
 		 */
 		EAttribute ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS = ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS;
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.Sorting <em>Sorting</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.Sorting <em>Sorting</em>}' enum.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.Sorting
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSorting()
 		 * @generated
@@ -8403,9 +8788,10 @@
 		EEnum SORTING = eINSTANCE.getSorting();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.Filtering <em>Filtering</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.Filtering <em>Filtering</em>}' enum.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.Filtering
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFiltering()
 		 * @generated
@@ -8413,9 +8799,10 @@
 		EEnum FILTERING = eINSTANCE.getFiltering();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.Routing <em>Routing</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.Routing <em>Routing</em>}' enum.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.Routing
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRouting()
 		 * @generated
@@ -8423,9 +8810,10 @@
 		EEnum ROUTING = eINSTANCE.getRouting();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.Smoothness <em>Smoothness</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.Smoothness <em>Smoothness</em>}'
+		 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.Smoothness
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSmoothness()
 		 * @generated
@@ -8433,9 +8821,10 @@
 		EEnum SMOOTHNESS = eINSTANCE.getSmoothness();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.JumpLinkStatus <em>Jump Link Status</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.JumpLinkStatus <em>Jump Link
+		 * Status</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.JumpLinkStatus
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getJumpLinkStatus()
 		 * @generated
@@ -8443,9 +8832,10 @@
 		EEnum JUMP_LINK_STATUS = eINSTANCE.getJumpLinkStatus();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.JumpLinkType <em>Jump Link Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.JumpLinkType <em>Jump Link
+		 * Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.JumpLinkType
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getJumpLinkType()
 		 * @generated
@@ -8453,9 +8843,10 @@
 		EEnum JUMP_LINK_TYPE = eINSTANCE.getJumpLinkType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.Alignment <em>Alignment</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.Alignment <em>Alignment</em>}' enum.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.Alignment
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getAlignment()
 		 * @generated
@@ -8463,9 +8854,10 @@
 		EEnum ALIGNMENT = eINSTANCE.getAlignment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.SortingDirection <em>Sorting Direction</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.SortingDirection <em>Sorting
+		 * Direction</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.SortingDirection
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSortingDirection()
 		 * @generated
@@ -8473,9 +8865,10 @@
 		EEnum SORTING_DIRECTION = eINSTANCE.getSortingDirection();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.MeasurementUnit <em>Measurement Unit</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.MeasurementUnit <em>Measurement
+		 * Unit</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.MeasurementUnit
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getMeasurementUnit()
 		 * @generated
@@ -8483,9 +8876,10 @@
 		EEnum MEASUREMENT_UNIT = eINSTANCE.getMeasurementUnit();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.TextAlignment <em>Text Alignment</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.TextAlignment <em>Text
+		 * Alignment</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.TextAlignment
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getTextAlignment()
 		 * @generated
@@ -8493,9 +8887,10 @@
 		EEnum TEXT_ALIGNMENT = eINSTANCE.getTextAlignment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.LineType <em>Line Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.LineType <em>Line Type</em>}' enum.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.LineType
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getLineType()
 		 * @generated
@@ -8503,9 +8898,10 @@
 		EEnum LINE_TYPE = eINSTANCE.getLineType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.ArrowType <em>Arrow Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.ArrowType <em>Arrow Type</em>}'
+		 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.ArrowType
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getArrowType()
 		 * @generated
@@ -8513,9 +8909,10 @@
 		EEnum ARROW_TYPE = eINSTANCE.getArrowType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.runtime.notation.GradientStyle <em>Gradient Style</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.gmf.runtime.notation.GradientStyle <em>Gradient
+		 * Style</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.GradientStyle
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getGradientStyle()
 		 * @generated
@@ -8524,8 +8921,8 @@
 
 		/**
 		 * The meta object literal for the '<em>Relative Bendpoint List</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.util.List
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRelativeBendpointList()
 		 * @generated
@@ -8533,9 +8930,9 @@
 		EDataType RELATIVE_BENDPOINT_LIST = eINSTANCE.getRelativeBendpointList();
 
 		/**
-		 * The meta object literal for the '<em>Filter Key List</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Filter Key List</em>' data type. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.util.List
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFilterKeyList()
 		 * @generated
@@ -8543,9 +8940,9 @@
 		EDataType FILTER_KEY_LIST = eINSTANCE.getFilterKeyList();
 
 		/**
-		 * The meta object literal for the '<em>Sort Key Map</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Sort Key Map</em>' data type. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see java.util.Map
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSortKeyMap()
 		 * @generated
@@ -8553,9 +8950,9 @@
 		EDataType SORT_KEY_MAP = eINSTANCE.getSortKeyMap();
 
 		/**
-		 * The meta object literal for the '<em>Gradient Data</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Gradient Data</em>' data type. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.gmf.runtime.notation.datatype.GradientData
 		 * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getGradientData()
 		 * @generated
@@ -8564,4 +8961,4 @@
 
 	}
 
-} //NotationPackage
+} // NotationPackage
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPlugin.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPlugin.java
index c56857a..029f968 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPlugin.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPlugin.java
@@ -24,38 +24,35 @@
 /*
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
-public final class NotationPlugin
-	extends EMFPlugin {
+public final class NotationPlugin extends EMFPlugin {
 
 	/**
-	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
 	public static final NotationPlugin INSTANCE = new NotationPlugin();
 
 	/**
-	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
 
-    /**
-	 * Create the instance.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotationPlugin() {
-		super(new ResourceLocator [] {});
+		super(new ResourceLocator[] {});
 	}
 
-    /**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	/**
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -63,10 +60,10 @@
 		return plugin;
 	}
 
-    /**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	/**
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -75,18 +72,16 @@
 	}
 
 	/**
-	 * The actual implementation of the Eclipse <b>Plugin </b>. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * The actual implementation of the Eclipse <b>Plugin </b>. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
-	public static class Implementation
-		extends EclipsePlugin {
+	public static class Implementation extends EclipsePlugin {
 
-        /**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		/**
+		 * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
@@ -96,5 +91,5 @@
 			//
 			plugin = this;
 		}
-    }
+	}
 }
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PageStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PageStyle.java
index d1e7c73..44f8c7e 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PageStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PageStyle.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Page Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Page
+ * Style</b></em>'.
  * <p>
  * The page style is a style to be installed on multi-page diagrams
  * </p>
@@ -23,13 +22,17 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageX <em>Page X</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageY <em>Page Y</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageWidth <em>Page Width</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageHeight <em>Page Height</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageX <em>Page
+ * X</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageY <em>Page
+ * Y</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageWidth <em>Page
+ * Width</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageHeight <em>Page
+ * Height</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPageStyle()
  * @model
@@ -39,14 +42,14 @@
  * @canBeSeenBy %partners
  */
 public interface PageStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Page X</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Page X</b></em>' attribute. The default
+	 * value is <code>"0"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the x-origin of the page.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Page X</em>' attribute.
 	 * @see #setPageX(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPageStyle_PageX()
@@ -55,27 +58,29 @@
 	 */
 	int getPageX();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageX <em>Page X</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageX <em>Page X</em>}'
+	 * attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the x-origin of the page.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Page X</em>' attribute.
 	 * @see #getPageX()
 	 * @generated
 	 */
 	void setPageX(int value);
 
-    /**
-	 * Returns the value of the '<em><b>Page Y</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Page Y</b></em>' attribute. The default
+	 * value is <code>"0"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the y-origin of the page.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Page Y</em>' attribute.
 	 * @see #setPageY(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPageStyle_PageY()
@@ -84,27 +89,29 @@
 	 */
 	int getPageY();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageY <em>Page Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageY <em>Page Y</em>}'
+	 * attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the x-origin of the page.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Page Y</em>' attribute.
 	 * @see #getPageY()
 	 * @generated
 	 */
 	void setPageY(int value);
 
-    /**
-	 * Returns the value of the '<em><b>Page Width</b></em>' attribute.
-	 * The default value is <code>"100"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Page Width</b></em>' attribute. The default
+	 * value is <code>"100"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the width of the page.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Page Width</em>' attribute.
 	 * @see #setPageWidth(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPageStyle_PageWidth()
@@ -113,27 +120,29 @@
 	 */
 	int getPageWidth();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageWidth <em>Page Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageWidth <em>Page
+	 * Width</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the width of the page.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Page Width</em>' attribute.
 	 * @see #getPageWidth()
 	 * @generated
 	 */
 	void setPageWidth(int value);
 
-    /**
-	 * Returns the value of the '<em><b>Page Height</b></em>' attribute.
-	 * The default value is <code>"100"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Page Height</b></em>' attribute. The default
+	 * value is <code>"100"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the height of the page.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Page Height</em>' attribute.
 	 * @see #setPageHeight(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPageStyle_PageHeight()
@@ -142,13 +151,15 @@
 	 */
 	int getPageHeight();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageHeight <em>Page Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle#getPageHeight <em>Page
+	 * Height</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the height of the page.
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Page Height</em>' attribute.
 	 * @see #getPageHeight()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PropertiesSetStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PropertiesSetStyle.java
index 8ecc9a6..076660a 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PropertiesSetStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PropertiesSetStyle.java
@@ -15,16 +15,16 @@
 import org.eclipse.emf.ecore.EDataType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Properties Set Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Properties Set Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle#getPropertiesMap <em>Properties Map</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle#getPropertiesMap
+ * <em>Properties Map</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPropertiesSetStyle()
  * @model
@@ -32,65 +32,68 @@
  */
 public interface PropertiesSetStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>Properties Map</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link org.eclipse.gmf.runtime.notation.PropertyValue},
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Properties Map</b></em>' map. The key is of
+	 * type {@link java.lang.String}, and the value is of type
+	 * {@link org.eclipse.gmf.runtime.notation.PropertyValue}, <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Properties Map</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Properties Map</em>' containment reference list
+	 * isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Properties Map</em>' map.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPropertiesSetStyle_PropertiesMap()
-	 * @model mapType="org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry" keyType="java.lang.String" valueType="org.eclipse.gmf.runtime.notation.PropertyValue"
+	 * @model mapType="org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry"
+	 *        keyType="java.lang.String"
+	 *        valueType="org.eclipse.gmf.runtime.notation.PropertyValue"
 	 * @generated
 	 */
 	EMap getPropertiesMap();
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
 	Object getProperty(String propertyName);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
 	boolean setProperty(String propertyName, Object newValue);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
 	boolean createProperty(String propertyName, EDataType instanceType, Object initialValue);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
 	boolean removeProperty(String propertyName);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
 	boolean hasProperty(String propertyName);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PropertyValue.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PropertyValue.java
index 7005ade..072c36b 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PropertyValue.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/PropertyValue.java
@@ -14,17 +14,18 @@
 import org.eclipse.emf.ecore.EDataType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property Value</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Property
+ * Value</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.PropertyValue#getRawValue <em>Raw Value</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.PropertyValue#getInstanceType <em>Instance Type</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.PropertyValue#getRawValue <em>Raw
+ * Value</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.PropertyValue#getInstanceType
+ * <em>Instance Type</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPropertyValue()
  * @model
@@ -32,13 +33,14 @@
  */
 public interface PropertyValue extends StringObjectConverter {
 	/**
-	 * Returns the value of the '<em><b>Raw Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Raw Value</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Raw Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Raw Value</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Raw Value</em>' attribute.
 	 * @see #setRawValue(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPropertyValue_RawValue()
@@ -48,9 +50,10 @@
 	String getRawValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.PropertyValue#getRawValue <em>Raw Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertyValue#getRawValue <em>Raw
+	 * Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Raw Value</em>' attribute.
 	 * @see #getRawValue()
 	 * @generated
@@ -58,13 +61,14 @@
 	void setRawValue(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Instance Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Instance Type</b></em>' reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Instance Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Instance Type</em>' reference isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Instance Type</em>' reference.
 	 * @see #setInstanceType(EDataType)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getPropertyValue_InstanceType()
@@ -74,9 +78,11 @@
 	EDataType getInstanceType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.PropertyValue#getInstanceType <em>Instance Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertyValue#getInstanceType
+	 * <em>Instance Type</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>Instance Type</em>' reference.
 	 * @see #getInstanceType()
 	 * @generated
@@ -84,16 +90,16 @@
 	void setInstanceType(EDataType value);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model kind="operation"
 	 * @generated
 	 */
 	Object getValue();
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Ratio.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Ratio.java
index 0fd0645..e354fbe 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Ratio.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Ratio.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ratio</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Ratio</b></em>'.
  * <p>
  * The ratio constraint specifies the size ratio of a node in its container
  * </p>
@@ -23,10 +22,11 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Ratio#getValue <em>Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Ratio#getValue
+ * <em>Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRatio()
  * @model
@@ -36,14 +36,14 @@
  * @canBeSeenBy %partners
  */
 public interface Ratio extends LayoutConstraint {
-    /**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. The default value
+	 * is <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * The value is the ratio of the view to its container
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(double)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRatio_Value()
@@ -52,11 +52,11 @@
 	 */
 	double getValue();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Ratio#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * The value is the ratio of the view to its container
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Ratio#getValue
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> The value is the ratio of
+	 * the view to its container <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RelativeBendpoints.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RelativeBendpoints.java
index 2d0eeb1..4926e4b 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RelativeBendpoints.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RelativeBendpoints.java
@@ -15,20 +15,21 @@
 import java.util.List;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Relative Bendpoints</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Relative
+ * Bendpoints</b></em>'.
  * <p>
- * A type of bendpoints representing a collection of points with relative distances 
- * along the x- and y-axis to the source and target views of an edge.
+ * A type of bendpoints representing a collection of points with relative
+ * distances along the x- and y-axis to the source and target views of an edge.
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints#getPoints <em>Points</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints#getPoints
+ * <em>Points</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRelativeBendpoints()
  * @model
@@ -37,33 +38,43 @@
 /*
  * @canBeSeenBy %partners
  */
-public interface RelativeBendpoints extends Bendpoints{
+public interface RelativeBendpoints extends Bendpoints {
 	/**
-	 * Returns the value of the '<em><b>Points</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Points</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * The value is a non-modifiable list of <code>org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint</code> objects
-	 * Any attempt to change the returned list will result in <code>UnsupportedOperationException</code> thrown;
-	 * instead use <code>setPoints</code> to change the list
+	 * The value is a non-modifiable list of
+	 * <code>org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint</code>
+	 * objects Any attempt to change the returned list will result in
+	 * <code>UnsupportedOperationException</code> thrown; instead use
+	 * <code>setPoints</code> to change the list
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Points</em>' attribute.
 	 * @see #setPoints(List)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRelativeBendpoints_Points()
-	 * @model dataType="org.eclipse.gmf.runtime.notation.RelativeBendpointList" many="false"
+	 * @model dataType="org.eclipse.gmf.runtime.notation.RelativeBendpointList"
+	 *        many="false"
 	 * @generated NOT
 	 */
 	List getPoints();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints#getPoints <em>Points</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * The value must be an empty list or one that contains only <code>org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint</code> objects
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Points</em>' attribute. The value cannot be <code>null</code>
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints#getPoints
+	 * <em>Points</em>}' attribute. <!-- begin-user-doc --> The value must be an
+	 * empty list or one that contains only
+	 * <code>org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint</code>
+	 * objects <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Points</em>' attribute. The value
+	 *              cannot be <code>null</code>
 	 * @see #getPoints()
-	 * @throws NullPointerException if the passed list is <code>null</code>
-	 * @throws IllegalArgumentException if one or more objects in the passed list is not of type <code>corg.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint</code> 
+	 * @throws NullPointerException     if the passed list is <code>null</code>
+	 * @throws IllegalArgumentException if one or more objects in the passed list is
+	 *                                  not of type
+	 *                                  <code>corg.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint</code>
 	 * @generated NOT
 	 */
 	void setPoints(List value);
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RoundedCornersStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RoundedCornersStyle.java
index 83100a4..1a50e2c 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RoundedCornersStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RoundedCornersStyle.java
@@ -11,34 +11,33 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rounded Corners Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Rounded
+ * Corners Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle#getRoundedBendpointsRadius <em>Rounded Bendpoints Radius</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle#getRoundedBendpointsRadius
+ * <em>Rounded Bendpoints Radius</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRoundedCornersStyle()
  * @model
  * @generated
- * @since 1.4 
+ * @since 1.4
  */
 public interface RoundedCornersStyle extends Style {
 	/**
-	 * Returns the value of the '<em><b>Rounded Bendpoints Radius</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Rounded Bendpoints Radius</b></em>'
+	 * attribute. The default value is <code>"0"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Rounded Bendpoints Radius</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Rounded Bendpoints Radius</em>' attribute isn't
+	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Rounded Bendpoints Radius</em>' attribute.
 	 * @see #setRoundedBendpointsRadius(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRoundedCornersStyle_RoundedBendpointsRadius()
@@ -48,10 +47,13 @@
 	int getRoundedBendpointsRadius();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle#getRoundedBendpointsRadius <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rounded Bendpoints Radius</em>' attribute.
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle#getRoundedBendpointsRadius
+	 * <em>Rounded Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Rounded Bendpoints Radius</em>'
+	 *              attribute.
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Routing.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Routing.java
index 749af0e..2ef478b 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Routing.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Routing.java
@@ -19,10 +19,10 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Routing</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Routing</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRouting()
  * @model
  * @generated
@@ -31,10 +31,10 @@
  * @canBeSeenBy %partners
  */
 public final class Routing extends AbstractEnumerator {
-    /**
-	 * The '<em><b>Manual</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Manual</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #MANUAL_LITERAL
 	 * @model name="Manual"
 	 * @generated
@@ -42,10 +42,10 @@
 	 */
 	public static final int MANUAL = 0;
 
-    /**
-	 * The '<em><b>Rectilinear</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Rectilinear</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #RECTILINEAR_LITERAL
 	 * @model name="Rectilinear"
 	 * @generated
@@ -53,10 +53,10 @@
 	 */
 	public static final int RECTILINEAR = 1;
 
-    /**
-	 * The '<em><b>Tree</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Tree</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #TREE_LITERAL
 	 * @model name="Tree"
 	 * @generated
@@ -64,61 +64,58 @@
 	 */
 	public static final int TREE = 2;
 
-    /**
-	 * The '<em><b>Manual</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Manual</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #MANUAL
 	 * @generated
 	 * @ordered
 	 */
 	public static final Routing MANUAL_LITERAL = new Routing(MANUAL, "Manual", "Manual"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Rectilinear</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>Rectilinear</b></em>' literal object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RECTILINEAR
 	 * @generated
 	 * @ordered
 	 */
 	public static final Routing RECTILINEAR_LITERAL = new Routing(RECTILINEAR, "Rectilinear", "Rectilinear"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Tree</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Tree</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #TREE
 	 * @generated
 	 * @ordered
 	 */
 	public static final Routing TREE_LITERAL = new Routing(TREE, "Tree", "Tree"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Routing</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Routing</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final Routing[] VALUES_ARRAY =
-        new Routing[] {
-			MANUAL_LITERAL,
-			RECTILINEAR_LITERAL,
-			TREE_LITERAL,
-		};
+	private static final Routing[] VALUES_ARRAY = new Routing[] { MANUAL_LITERAL, RECTILINEAR_LITERAL, TREE_LITERAL, };
 
-    /**
+	/**
 	 * A public read-only list of all the '<em><b>Routing</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Routing</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Routing</b></em>' literal with the specified literal
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Routing get(String literal) {
@@ -131,13 +128,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Routing</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Routing</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static Routing getByName(String name) {
+	public static Routing getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			Routing result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -147,29 +146,34 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Routing</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Routing</b></em>' literal with the specified integer
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Routing get(int value) {
 		switch (value) {
-			case MANUAL: return MANUAL_LITERAL;
-			case RECTILINEAR: return RECTILINEAR_LITERAL;
-			case TREE: return TREE_LITERAL;
+		case MANUAL:
+			return MANUAL_LITERAL;
+		case RECTILINEAR:
+			return RECTILINEAR_LITERAL;
+		case TREE:
+			return TREE_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private Routing(int value, String name, String literal) {
+	private Routing(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //Routing
+} // Routing
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RoutingStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RoutingStyle.java
index 2bd13b9..5391741 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RoutingStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/RoutingStyle.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Routing Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Routing
+ * Style</b></em>'.
  * <p>
  * The routing style is a style to be installed on edges to guide their routing
  * </p>
@@ -23,36 +22,42 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting <em>Routing</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness <em>Smoothness</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions <em>Avoid Obstructions</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance <em>Closest Distance</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus <em>Jump Link Status</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType <em>Jump Link Type</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse <em>Jump Links Reverse</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting
+ * <em>Routing</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness
+ * <em>Smoothness</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions
+ * <em>Avoid Obstructions</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance
+ * <em>Closest Distance</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus
+ * <em>Jump Link Status</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType
+ * <em>Jump Link Type</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse
+ * <em>Jump Links Reverse</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRoutingStyle()
  * @model
  * @generated
- * @noimplement This interface is not intended to be implemented by clients.
  */
 /*
  * @canBeSeenBy %partners
  */
 public interface RoutingStyle extends RoundedCornersStyle {
 
-    /**
-	 * Returns the value of the '<em><b>Routing</b></em>' attribute.
-	 * The default value is <code>"Manual"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.Routing}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Routing</b></em>' attribute. The default
+	 * value is <code>"Manual"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.Routing}. <!-- begin-user-doc -->
 	 * <p>
 	 * The property specifies the desired routing algorithm
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Routing</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Routing
 	 * @see #setRouting(Routing)
@@ -62,13 +67,15 @@
 	 */
 	Routing getRouting();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting
+	 * <em>Routing</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The property specifies the desired routing algorithm
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Routing</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Routing
 	 * @see #getRouting()
@@ -76,15 +83,15 @@
 	 */
 	void setRouting(Routing value);
 
-    /**
-	 * Returns the value of the '<em><b>Smoothness</b></em>' attribute.
-	 * The default value is <code>"None"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.Smoothness}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Smoothness</b></em>' attribute. The default
+	 * value is <code>"None"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.Smoothness}. <!-- begin-user-doc -->
 	 * <p>
 	 * The property specifies the desired smoothing for the edge'e line
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Smoothness</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Smoothness
 	 * @see #setSmoothness(Smoothness)
@@ -94,13 +101,15 @@
 	 */
 	Smoothness getSmoothness();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness
+	 * <em>Smoothness</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The property specifies the desired smoothing for the edge'e line
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Smoothness</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Smoothness
 	 * @see #getSmoothness()
@@ -108,14 +117,14 @@
 	 */
 	void setSmoothness(Smoothness value);
 
-    /**
-	 * Returns the value of the '<em><b>Avoid Obstructions</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Avoid Obstructions</b></em>' attribute. The
+	 * default value is <code>"false"</code>. <!-- begin-user-doc -->
 	 * <p>
 	 * The property specifies whether the edge's router should avoid obstructions
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Avoid Obstructions</em>' attribute.
 	 * @see #setAvoidObstructions(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRoutingStyle_AvoidObstructions()
@@ -124,27 +133,30 @@
 	 */
 	boolean isAvoidObstructions();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions <em>Avoid Obstructions</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions
+	 * <em>Avoid Obstructions</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * The property specifies whether the edge's router should avoid obstructions
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Avoid Obstructions</em>' attribute.
 	 * @see #isAvoidObstructions()
 	 * @generated
 	 */
 	void setAvoidObstructions(boolean value);
 
-    /**
-	 * Returns the value of the '<em><b>Closest Distance</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Closest Distance</b></em>' attribute. The
+	 * default value is <code>"false"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * The property specifies whether the edge's router should should choose closest distances
+	 * The property specifies whether the edge's router should should choose closest
+	 * distances
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Closest Distance</em>' attribute.
 	 * @see #setClosestDistance(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRoutingStyle_ClosestDistance()
@@ -153,28 +165,33 @@
 	 */
 	boolean isClosestDistance();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance <em>Closest Distance</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance
+	 * <em>Closest Distance</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * The property specifies whether the edge's router should should choose closest distances
+	 * The property specifies whether the edge's router should should choose closest
+	 * distances
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Closest Distance</em>' attribute.
 	 * @see #isClosestDistance()
 	 * @generated
 	 */
 	void setClosestDistance(boolean value);
 
-    /**
-	 * Returns the value of the '<em><b>Jump Link Status</b></em>' attribute.
-	 * The default value is <code>"None"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.JumpLinkStatus}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Jump Link Status</b></em>' attribute. The
+	 * default value is <code>"None"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.JumpLinkStatus}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * The property specifies the status of the jump links used in the routing algorithm
+	 * The property specifies the status of the jump links used in the routing
+	 * algorithm
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Jump Link Status</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.JumpLinkStatus
 	 * @see #setJumpLinkStatus(JumpLinkStatus)
@@ -184,13 +201,16 @@
 	 */
 	JumpLinkStatus getJumpLinkStatus();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus
+	 * <em>Jump Link Status</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * The property specifies the status of the jump links used in the routing algorithm
+	 * The property specifies the status of the jump links used in the routing
+	 * algorithm
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Jump Link Status</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.JumpLinkStatus
 	 * @see #getJumpLinkStatus()
@@ -198,15 +218,17 @@
 	 */
 	void setJumpLinkStatus(JumpLinkStatus value);
 
-    /**
-	 * Returns the value of the '<em><b>Jump Link Type</b></em>' attribute.
-	 * The default value is <code>"Semicircle"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.JumpLinkType}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Jump Link Type</b></em>' attribute. The
+	 * default value is <code>"Semicircle"</code>. The literals are from the
+	 * enumeration {@link org.eclipse.gmf.runtime.notation.JumpLinkType}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * The property specifies the type of the jump links used in the routing algorithm
+	 * The property specifies the type of the jump links used in the routing
+	 * algorithm
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Jump Link Type</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.JumpLinkType
 	 * @see #setJumpLinkType(JumpLinkType)
@@ -216,13 +238,16 @@
 	 */
 	JumpLinkType getJumpLinkType();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType
+	 * <em>Jump Link Type</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * The property specifies the type of the jump links used in the routing algorithm
+	 * The property specifies the type of the jump links used in the routing
+	 * algorithm
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Jump Link Type</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.JumpLinkType
 	 * @see #getJumpLinkType()
@@ -230,14 +255,15 @@
 	 */
 	void setJumpLinkType(JumpLinkType value);
 
-    /**
-	 * Returns the value of the '<em><b>Jump Links Reverse</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Jump Links Reverse</b></em>' attribute. The
+	 * default value is <code>"false"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * The property specifies whether the jump links used in the routing algorithm should be reveresed
+	 * The property specifies whether the jump links used in the routing algorithm
+	 * should be reveresed
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Jump Links Reverse</em>' attribute.
 	 * @see #setJumpLinksReverse(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getRoutingStyle_JumpLinksReverse()
@@ -246,13 +272,16 @@
 	 */
 	boolean isJumpLinksReverse();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse <em>Jump Links Reverse</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse
+	 * <em>Jump Links Reverse</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * The property specifies whether the jump links used in the routing algorithm should be reveresed
+	 * The property specifies whether the jump links used in the routing algorithm
+	 * should be reveresed
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Jump Links Reverse</em>' attribute.
 	 * @see #isJumpLinksReverse()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SemanticListCompartment.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SemanticListCompartment.java
index 2b45b85..2e1f121 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SemanticListCompartment.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SemanticListCompartment.java
@@ -11,12 +11,11 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Semantic List Compartment</b></em>'.
- * <p><b>
- * Does not support addition/removal of:
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Semantic
+ * List Compartment</b></em>'.
+ * <p>
+ * <b> Does not support addition/removal of:
  * <ul>
  * <li>Source Edges
  * <li>Target Edges
@@ -24,7 +23,8 @@
  * <li>Children
  * <li>Styles
  * </ul>
- * </b></p>
+ * </b>
+ * </p>
  * <!-- end-user-doc -->
  *
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Shape.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Shape.java
index 552bc27..79003b8 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Shape.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Shape.java
@@ -1,28 +1,25 @@
-/******************************************************************************

- * Copyright (c) 2008 IBM Corporation and others.

- * This program and the accompanying materials are made

- * available under the terms of the Eclipse Public License 2.0

- * which is available at https://www.eclipse.org/legal/epl-2.0/

- *

- * SPDX-License-Identifier: EPL-2.0

- *

- * Contributors:

- *    IBM Corporation - initial API and implementation 

- ****************************************************************************/

-package org.eclipse.gmf.runtime.notation;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Shape</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.gmf.runtime.notation.NotationPackage#getShape()

- * @model

- * @generated

- * @since 1.2

- * @noimplement This interface is not intended to be implemented by clients.

- */

-public interface Shape extends Node, ShapeStyle {

-} // Shape

+/******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation 
+ ****************************************************************************/
+package org.eclipse.gmf.runtime.notation;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Shape</b></em>'. <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.gmf.runtime.notation.NotationPackage#getShape()
+ * @model
+ * @generated
+ * @since 1.2
+ */
+public interface Shape extends Node, ShapeStyle {
+} // Shape
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ShapeStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ShapeStyle.java
index 229fccb..ecd8cee 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ShapeStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/ShapeStyle.java
@@ -13,12 +13,12 @@
 package org.eclipse.gmf.runtime.notation;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Shape Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Shape
+ * Style</b></em>'.
  * <p>
- * A shape style is a typical style to be installed on shape nodes that 
- * own a description (like note shapes). It gives the node fill, line, 
- * font and description style properties 
+ * A shape style is a typical style to be installed on shape nodes that own a
+ * description (like note shapes). It gives the node fill, line, font and
+ * description style properties
  * </p>
  * <!-- end-user-doc -->
  *
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SingleValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SingleValueStyle.java
index 2e00f54..4e08d5d 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SingleValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SingleValueStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Single Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Single
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.SingleValueStyle#getRawValue <em>Raw Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.SingleValueStyle#getRawValue
+ * <em>Raw Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSingleValueStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface SingleValueStyle extends DataTypeStyle {
 	/**
-	 * Returns the value of the '<em><b>Raw Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Raw Value</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Raw Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Raw Value</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Raw Value</em>' attribute.
 	 * @see #setRawValue(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSingleValueStyle_RawValue()
@@ -46,9 +46,10 @@
 	String getRawValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.SingleValueStyle#getRawValue <em>Raw Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.SingleValueStyle#getRawValue <em>Raw
+	 * Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Raw Value</em>' attribute.
 	 * @see #getRawValue()
 	 * @generated
@@ -56,16 +57,16 @@
 	void setRawValue(String value);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model kind="operation"
 	 * @generated
 	 */
 	Object getValue();
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Size.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Size.java
index 113bf86..4f3e8b2 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Size.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Size.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Size</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Size</b></em>'.
  * <p>
  * The size constraint specifies the extents of a node
  * </p>
@@ -23,11 +22,13 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Size#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.Size#getHeight <em>Height</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Size#getWidth
+ * <em>Width</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.Size#getHeight
+ * <em>Height</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSize()
  * @model
@@ -37,11 +38,10 @@
  * @canBeSeenBy %partners
  */
 public interface Size extends LayoutConstraint {
-    /**
-	 * Returns the value of the '<em><b>Width</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Width</b></em>' attribute. The default value
+	 * is <code>"-1"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Width</em>' attribute.
 	 * @see #setWidth(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSize_Width()
@@ -50,21 +50,20 @@
 	 */
 	int getWidth();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Size#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Size#getWidth
+	 * <em>Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Width</em>' attribute.
 	 * @see #getWidth()
 	 * @generated
 	 */
 	void setWidth(int value);
 
-    /**
-	 * Returns the value of the '<em><b>Height</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Height</b></em>' attribute. The default
+	 * value is <code>"-1"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Height</em>' attribute.
 	 * @see #setHeight(int)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSize_Height()
@@ -73,10 +72,10 @@
 	 */
 	int getHeight();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Size#getHeight <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Size#getHeight
+	 * <em>Height</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Height</em>' attribute.
 	 * @see #getHeight()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Smoothness.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Smoothness.java
index 1b7b219..f2af3bb 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Smoothness.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Smoothness.java
@@ -19,10 +19,10 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Smoothness</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Smoothness</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSmoothness()
  * @model
  * @generated
@@ -31,10 +31,10 @@
  * @canBeSeenBy %partners
  */
 public final class Smoothness extends AbstractEnumerator {
-    /**
-	 * The '<em><b>None</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>None</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE_LITERAL
 	 * @model name="None"
 	 * @generated
@@ -42,10 +42,10 @@
 	 */
 	public static final int NONE = 0;
 
-    /**
-	 * The '<em><b>Normal</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Normal</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NORMAL_LITERAL
 	 * @model name="Normal"
 	 * @generated
@@ -53,10 +53,10 @@
 	 */
 	public static final int NORMAL = 1;
 
-    /**
-	 * The '<em><b>Less</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Less</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #LESS_LITERAL
 	 * @model name="Less"
 	 * @generated
@@ -64,10 +64,10 @@
 	 */
 	public static final int LESS = 2;
 
-    /**
-	 * The '<em><b>More</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>More</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #MORE_LITERAL
 	 * @model name="More"
 	 * @generated
@@ -75,72 +75,69 @@
 	 */
 	public static final int MORE = 3;
 
-    /**
-	 * The '<em><b>None</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>None</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE
 	 * @generated
 	 * @ordered
 	 */
 	public static final Smoothness NONE_LITERAL = new Smoothness(NONE, "None", "None"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Normal</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Normal</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NORMAL
 	 * @generated
 	 * @ordered
 	 */
 	public static final Smoothness NORMAL_LITERAL = new Smoothness(NORMAL, "Normal", "Normal"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Less</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Less</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #LESS
 	 * @generated
 	 * @ordered
 	 */
 	public static final Smoothness LESS_LITERAL = new Smoothness(LESS, "Less", "Less"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>More</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>More</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #MORE
 	 * @generated
 	 * @ordered
 	 */
 	public static final Smoothness MORE_LITERAL = new Smoothness(MORE, "More", "More"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Smoothness</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Smoothness</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final Smoothness[] VALUES_ARRAY =
-        new Smoothness[] {
-			NONE_LITERAL,
-			NORMAL_LITERAL,
-			LESS_LITERAL,
-			MORE_LITERAL,
-		};
+	private static final Smoothness[] VALUES_ARRAY = new Smoothness[] { NONE_LITERAL, NORMAL_LITERAL, LESS_LITERAL,
+			MORE_LITERAL, };
 
-    /**
+	/**
 	 * A public read-only list of all the '<em><b>Smoothness</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Smoothness</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Smoothness</b></em>' literal with the specified literal
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Smoothness get(String literal) {
@@ -153,13 +150,15 @@
 		return null;
 	}
 
-    /**
+	/**
 	 * Returns the '<em><b>Smoothness</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static Smoothness getByName(String name) {
+	public static Smoothness getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			Smoothness result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -169,30 +168,36 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Smoothness</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Smoothness</b></em>' literal with the specified integer
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Smoothness get(int value) {
 		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case NORMAL: return NORMAL_LITERAL;
-			case LESS: return LESS_LITERAL;
-			case MORE: return MORE_LITERAL;
+		case NONE:
+			return NONE_LITERAL;
+		case NORMAL:
+			return NORMAL_LITERAL;
+		case LESS:
+			return LESS_LITERAL;
+		case MORE:
+			return MORE_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private Smoothness(int value, String name, String literal) {
+	private Smoothness(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //Smoothness
+} // Smoothness
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Sorting.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Sorting.java
index c4170f0..fc71701 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Sorting.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Sorting.java
@@ -19,10 +19,10 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Sorting</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Sorting</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSorting()
  * @model
  * @generated
@@ -31,10 +31,10 @@
  * @canBeSeenBy %partners
  */
 public final class Sorting extends AbstractEnumerator {
-    /**
-	 * The '<em><b>None</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>None</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE_LITERAL
 	 * @model name="None"
 	 * @generated
@@ -42,10 +42,10 @@
 	 */
 	public static final int NONE = 0;
 
-    /**
-	 * The '<em><b>Manual</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Manual</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #MANUAL_LITERAL
 	 * @model name="Manual"
 	 * @generated
@@ -53,10 +53,10 @@
 	 */
 	public static final int MANUAL = 1;
 
-    /**
-	 * The '<em><b>Automatic</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Automatic</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #AUTOMATIC_LITERAL
 	 * @model name="Automatic"
 	 * @generated
@@ -64,61 +64,58 @@
 	 */
 	public static final int AUTOMATIC = 2;
 
-    /**
-	 * The '<em><b>None</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>None</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #NONE
 	 * @generated
 	 * @ordered
 	 */
 	public static final Sorting NONE_LITERAL = new Sorting(NONE, "None", "None"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Manual</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Manual</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #MANUAL
 	 * @generated
 	 * @ordered
 	 */
 	public static final Sorting MANUAL_LITERAL = new Sorting(MANUAL, "Manual", "Manual"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Automatic</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Automatic</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #AUTOMATIC
 	 * @generated
 	 * @ordered
 	 */
 	public static final Sorting AUTOMATIC_LITERAL = new Sorting(AUTOMATIC, "Automatic", "Automatic"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Sorting</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Sorting</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final Sorting[] VALUES_ARRAY =
-        new Sorting[] {
-			NONE_LITERAL,
-			MANUAL_LITERAL,
-			AUTOMATIC_LITERAL,
-		};
+	private static final Sorting[] VALUES_ARRAY = new Sorting[] { NONE_LITERAL, MANUAL_LITERAL, AUTOMATIC_LITERAL, };
 
-    /**
+	/**
 	 * A public read-only list of all the '<em><b>Sorting</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Sorting</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Sorting</b></em>' literal with the specified literal
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Sorting get(String literal) {
@@ -131,13 +128,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Sorting</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Sorting</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static Sorting getByName(String name) {
+	public static Sorting getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			Sorting result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -147,29 +146,34 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Sorting</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Sorting</b></em>' literal with the specified integer
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Sorting get(int value) {
 		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case MANUAL: return MANUAL_LITERAL;
-			case AUTOMATIC: return AUTOMATIC_LITERAL;
+		case NONE:
+			return NONE_LITERAL;
+		case MANUAL:
+			return MANUAL_LITERAL;
+		case AUTOMATIC:
+			return AUTOMATIC_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private Sorting(int value, String name, String literal) {
+	private Sorting(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //Sorting
+} // Sorting
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SortingDirection.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SortingDirection.java
index 90841f9..9c45cd8 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SortingDirection.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SortingDirection.java
@@ -19,10 +19,10 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Sorting Direction</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Sorting Direction</b></em>', and utility methods for working with
+ * them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSortingDirection()
  * @model
  * @generated
@@ -31,10 +31,10 @@
  * @canBeSeenBy %partners
  */
 public final class SortingDirection extends AbstractEnumerator {
-    /**
-	 * The '<em><b>Ascending</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Ascending</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #ASCENDING_LITERAL
 	 * @model name="Ascending"
 	 * @generated
@@ -42,10 +42,10 @@
 	 */
 	public static final int ASCENDING = 0;
 
-    /**
-	 * The '<em><b>Descending</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Descending</b></em>' literal value. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #DESCENDING_LITERAL
 	 * @model name="Descending"
 	 * @generated
@@ -53,50 +53,50 @@
 	 */
 	public static final int DESCENDING = 1;
 
-    /**
-	 * The '<em><b>Ascending</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Ascending</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #ASCENDING
 	 * @generated
 	 * @ordered
 	 */
 	public static final SortingDirection ASCENDING_LITERAL = new SortingDirection(ASCENDING, "Ascending", "Ascending"); //$NON-NLS-2$//$NON-NLS-1$
 
-    /**
-	 * The '<em><b>Descending</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The '<em><b>Descending</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #DESCENDING
 	 * @generated
 	 * @ordered
 	 */
-	public static final SortingDirection DESCENDING_LITERAL = new SortingDirection(DESCENDING, "Descending", "Descending"); //$NON-NLS-2$//$NON-NLS-1$
+	public static final SortingDirection DESCENDING_LITERAL = new SortingDirection(DESCENDING, "Descending", //$NON-NLS-1$
+			"Descending"); //$NON-NLS-1$
 
-    /**
-	 * An array of all the '<em><b>Sorting Direction</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Sorting Direction</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final SortingDirection[] VALUES_ARRAY =
-        new SortingDirection[] {
-			ASCENDING_LITERAL,
-			DESCENDING_LITERAL,
-		};
+	private static final SortingDirection[] VALUES_ARRAY = new SortingDirection[] { ASCENDING_LITERAL,
+			DESCENDING_LITERAL, };
 
-    /**
-	 * A public read-only list of all the '<em><b>Sorting Direction</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * A public read-only list of all the '<em><b>Sorting Direction</b></em>'
+	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-    /**
-	 * Returns the '<em><b>Sorting Direction</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Sorting Direction</b></em>' literal with the specified
+	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SortingDirection get(String literal) {
@@ -109,13 +109,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Sorting Direction</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Sorting Direction</b></em>' literal with the specified
+	 * name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-    public static SortingDirection getByName(String name) {
+	public static SortingDirection getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
 			SortingDirection result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
@@ -125,28 +127,32 @@
 		return null;
 	}
 
-    /**
-	 * Returns the '<em><b>Sorting Direction</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Sorting Direction</b></em>' literal with the specified
+	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SortingDirection get(int value) {
 		switch (value) {
-			case ASCENDING: return ASCENDING_LITERAL;
-			case DESCENDING: return DESCENDING_LITERAL;
+		case ASCENDING:
+			return ASCENDING_LITERAL;
+		case DESCENDING:
+			return DESCENDING_LITERAL;
 		}
 		return null;
 	}
 
-    /**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    private SortingDirection(int value, String name, String literal) {
+	private SortingDirection(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //SortingDirection
+} // SortingDirection
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SortingStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SortingStyle.java
index c970e51..9e8732e 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SortingStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/SortingStyle.java
@@ -17,21 +17,25 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Sorting Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Sorting
+ * Style</b></em>'.
  * <p>
- * The sorting style is a style to be installed on nodes representing lists to be sorted
+ * The sorting style is a style to be installed on nodes representing lists to
+ * be sorted
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSorting <em>Sorting</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortingKeys <em>Sorting Keys</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortedObjects <em>Sorted Objects</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSorting
+ * <em>Sorting</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortingKeys
+ * <em>Sorting Keys</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortedObjects
+ * <em>Sorted Objects</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSortingStyle()
  * @model
@@ -41,15 +45,15 @@
  * @canBeSeenBy %partners
  */
 public interface SortingStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Sorting</b></em>' attribute.
-	 * The default value is <code>"None"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.Sorting}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Sorting</b></em>' attribute. The default
+	 * value is <code>"None"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.Sorting}. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the type of sorting applied to the list represented by the node
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sorting</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Sorting
 	 * @see #setSorting(Sorting)
@@ -59,13 +63,15 @@
 	 */
 	Sorting getSorting();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSorting <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSorting
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * This is the type of sorting applied to the list represented by the node
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Sorting</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.Sorting
 	 * @see #getSorting()
@@ -74,17 +80,21 @@
 	void setSorting(Sorting value);
 
 	/**
-	 * Returns the value of the '<em><b>Sorting Keys</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Sorting Keys</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * The property is an ordered map of sorting string keys to their <code>SortingDirection</code>. The key strings are user-defined and
-	 * normally used when the <em>Sorting</em> property is set to <em>Automatic</em>
+	 * The property is an ordered map of sorting string keys to their
+	 * <code>SortingDirection</code>. The key strings are user-defined and normally
+	 * used when the <em>Sorting</em> property is set to <em>Automatic</em>
 	 * 
-	 * The value is a non-modifiable map of <code>java.lang.String</code> objects to <code>org.eclipse.gmf.runtime.notation.SortingDirection</code> objects
-	 * Any attempt to change the returned map will result in <code>UnsupportedOperationException</code> thrown;
-	 * instead use <code>setSortingKeys</code> to change the map
+	 * The value is a non-modifiable map of <code>java.lang.String</code> objects to
+	 * <code>org.eclipse.gmf.runtime.notation.SortingDirection</code> objects Any
+	 * attempt to change the returned map will result in
+	 * <code>UnsupportedOperationException</code> thrown; instead use
+	 * <code>setSortingKeys</code> to change the map
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sorting Keys</em>' attribute.
 	 * @see #setSortingKeys(Map)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSortingStyle_SortingKeys()
@@ -94,32 +104,43 @@
 	Map getSortingKeys();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortingKeys <em>Sorting Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingStyle#getSortingKeys
+	 * <em>Sorting Keys</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * The property is an ordered map of sorting string keys to their <code>SortingDirection</code>. The key strings are user-defined and
-	 * normally used when the <em>Sorting</em> property is set to <em>Automatic</em>
+	 * The property is an ordered map of sorting string keys to their
+	 * <code>SortingDirection</code>. The key strings are user-defined and normally
+	 * used when the <em>Sorting</em> property is set to <em>Automatic</em>
 	 * 
-	 * The value must be an empty map or one that contains only <code>java.lang.String</code> objects in the keys and <code>org.eclipse.gmf.runtime.notation.Alignment</code> objects in the values
+	 * The value must be an empty map or one that contains only
+	 * <code>java.lang.String</code> objects in the keys and
+	 * <code>org.eclipse.gmf.runtime.notation.Alignment</code> objects in the values
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sorting Keys</em>' attribute. The value cannot be <code>null</code>
+	 * 
+	 * @param value the new value of the '<em>Sorting Keys</em>' attribute. The
+	 *              value cannot be <code>null</code>
 	 * @see #getSortingKeys()
-	 * @throws NullPointerException if the passed map is <code>null</code>
-	 * @throws IllegalArgumentException if one or more keys in the passed map is not of type <code>java.lang.String</code> or one or more values is not of type <code>org.eclipse.gmf.runtime.notation.Alignment</code>
+	 * @throws NullPointerException     if the passed map is <code>null</code>
+	 * @throws IllegalArgumentException if one or more keys in the passed map is not
+	 *                                  of type <code>java.lang.String</code> or one
+	 *                                  or more values is not of type
+	 *                                  <code>org.eclipse.gmf.runtime.notation.Alignment</code>
 	 * @generated NOT
 	 */
 	void setSortingKeys(Map value);
 
-    /**
-	 * Returns the value of the '<em><b>Sorted Objects</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Sorted Objects</b></em>' reference list. The
+	 * list contents are of type {@link org.eclipse.emf.ecore.EObject}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * The property is an ordered list of references to objects be sorted. The property is
-	 * normally used when the <em>Sorting</em> property is set to <em>Manual</em>
+	 * The property is an ordered list of references to objects be sorted. The
+	 * property is normally used when the <em>Sorting</em> property is set to
+	 * <em>Manual</em>
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Sorted Objects</em>' reference list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getSortingStyle_SortedObjects()
 	 * @model type="org.eclipse.emf.ecore.EObject"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StandardDiagram.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StandardDiagram.java
index bf5bac7..4c7bd03 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StandardDiagram.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StandardDiagram.java
@@ -11,11 +11,9 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Standard Diagram</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Standard
+ * Diagram</b></em>'. <!-- end-user-doc -->
  *
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getStandardDiagram()
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringListValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringListValueStyle.java
index a96e38b..a72dbc0 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringListValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringListValueStyle.java
@@ -14,16 +14,16 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>String
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.StringListValueStyle#getStringListValue <em>String List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.StringListValueStyle#getStringListValue
+ * <em>String List Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getStringListValueStyle()
  * @model
@@ -32,13 +32,14 @@
 public interface StringListValueStyle extends NamedStyle {
 	/**
 	 * Returns the value of the '<em><b>String List Value</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
+	 * The list contents are of type {@link java.lang.String}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>String List Value</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>String List Value</em>' attribute list isn't
+	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>String List Value</em>' attribute list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getStringListValueStyle_StringListValue()
 	 * @model unique="false"
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringObjectConverter.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringObjectConverter.java
index 86bcafb..9f1b12d 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringObjectConverter.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringObjectConverter.java
@@ -14,9 +14,8 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Object Converter</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>String
+ * Object Converter</b></em>'. <!-- end-user-doc -->
  *
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getStringObjectConverter()
@@ -25,16 +24,16 @@
  */
 public interface StringObjectConverter extends EObject {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
 	String getStringFromObject(Object objectValue);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringToPropertyValueMapEntry.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringToPropertyValueMapEntry.java
index 4873ec0..adfb7a3 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringToPropertyValueMapEntry.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringToPropertyValueMapEntry.java
@@ -14,15 +14,16 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String To Property Value Map Entry</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>String
+ * To Property Value Map Entry</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry#getKey
+ * <em>Key</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry#getValue
+ * <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -32,13 +33,14 @@
  */
 public interface StringToPropertyValueMapEntry extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Key</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Key</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Key</em>' attribute.
 	 * @see #setKey(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getStringToPropertyValueMapEntry_Key()
@@ -48,9 +50,10 @@
 	String getKey();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry#getKey <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry#getKey
+	 * <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Key</em>' attribute.
 	 * @see #getKey()
 	 * @generated
@@ -58,13 +61,14 @@
 	void setKey(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' reference.
 	 * @see #setValue(PropertyValue)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getStringToPropertyValueMapEntry_Value()
@@ -74,9 +78,10 @@
 	PropertyValue getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry#getValue <em>Value</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.StringToPropertyValueMapEntry#getValue
+	 * <em>Value</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Value</em>' reference.
 	 * @see #getValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringValueStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringValueStyle.java
index 1b9528d..87515af 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringValueStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/StringValueStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>String
+ * Value Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.StringValueStyle#getStringValue <em>String Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.StringValueStyle#getStringValue
+ * <em>String Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getStringValueStyle()
  * @model
@@ -30,13 +29,14 @@
  */
 public interface StringValueStyle extends NamedStyle {
 	/**
-	 * Returns the value of the '<em><b>String Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>String Value</b></em>' attribute. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>String Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>String Value</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>String Value</em>' attribute.
 	 * @see #setStringValue(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getStringValueStyle_StringValue()
@@ -46,9 +46,11 @@
 	String getStringValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.StringValueStyle#getStringValue <em>String Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.StringValueStyle#getStringValue
+	 * <em>String Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @param value the new value of the '<em>String Value</em>' attribute.
 	 * @see #getStringValue()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Style.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Style.java
index 5ed9331..5fdd474 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Style.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Style.java
@@ -15,11 +15,11 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>Style</b></em>'.
  * <p>
- * The basic abstraction of a collection of appearance properties 
- * that are usually grouped together
+ * The basic abstraction of a collection of appearance properties that are
+ * usually grouped together
  * </p>
  * <!-- end-user-doc -->
  *
@@ -31,6 +31,6 @@
 /*
  * @canBeSeenBy %partners
  */
-public interface Style extends EObject{
+public interface Style extends EObject {
 	// no APIs
 } // Style
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TextAlignment.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TextAlignment.java
index 9bbdb19..8709243 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TextAlignment.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TextAlignment.java
@@ -18,23 +18,23 @@
 import org.eclipse.emf.common.util.AbstractEnumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Text Alignment</b></em>',
- * and utility methods for working with them.
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration
+ * '<em><b>Text Alignment</b></em>', and utility methods for working with them.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getTextAlignment()
  * @model
  * @generated
  */
 public final class TextAlignment extends AbstractEnumerator {
 	/**
-	 * The '<em><b>Left</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Left</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Left</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Left</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #LEFT_LITERAL
 	 * @model name="Left"
 	 * @generated
@@ -43,13 +43,13 @@
 	public static final int LEFT = 0;
 
 	/**
-	 * The '<em><b>Right</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Right</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Right</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Right</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RIGHT_LITERAL
 	 * @model name="Right"
 	 * @generated
@@ -58,13 +58,13 @@
 	public static final int RIGHT = 1;
 
 	/**
-	 * The '<em><b>Center</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Center</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Center</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Center</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CENTER_LITERAL
 	 * @model name="Center"
 	 * @generated
@@ -73,9 +73,9 @@
 	public static final int CENTER = 2;
 
 	/**
-	 * The '<em><b>Left</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Left</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #LEFT
 	 * @generated
 	 * @ordered
@@ -83,9 +83,9 @@
 	public static final TextAlignment LEFT_LITERAL = new TextAlignment(LEFT, "Left", "Left"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Right</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Right</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #RIGHT
 	 * @generated
 	 * @ordered
@@ -93,9 +93,9 @@
 	public static final TextAlignment RIGHT_LITERAL = new TextAlignment(RIGHT, "Right", "Right"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Center</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Center</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #CENTER
 	 * @generated
 	 * @ordered
@@ -103,30 +103,28 @@
 	public static final TextAlignment CENTER_LITERAL = new TextAlignment(CENTER, "Center", "Center"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * An array of all the '<em><b>Text Alignment</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Text Alignment</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final TextAlignment[] VALUES_ARRAY =
-		new TextAlignment[] {
-			LEFT_LITERAL,
-			RIGHT_LITERAL,
-			CENTER_LITERAL,
-		};
+	private static final TextAlignment[] VALUES_ARRAY = new TextAlignment[] { LEFT_LITERAL, RIGHT_LITERAL,
+			CENTER_LITERAL, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Text Alignment</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Text Alignment</b></em>'
+	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Text Alignment</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Text Alignment</b></em>' literal with the specified
+	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TextAlignment get(String literal) {
@@ -141,8 +139,10 @@
 
 	/**
 	 * Returns the '<em><b>Text Alignment</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TextAlignment getByName(String name) {
@@ -156,28 +156,33 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Text Alignment</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Text Alignment</b></em>' literal with the specified
+	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TextAlignment get(int value) {
 		switch (value) {
-			case LEFT: return LEFT_LITERAL;
-			case RIGHT: return RIGHT_LITERAL;
-			case CENTER: return CENTER_LITERAL;
+		case LEFT:
+			return LEFT_LITERAL;
+		case RIGHT:
+			return RIGHT_LITERAL;
+		case CENTER:
+			return CENTER_LITERAL;
 		}
 		return null;
 	}
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private TextAlignment(int value, String name, String literal) {
 		super(value, name, literal);
 	}
 
-} //TextAlignment
+} // TextAlignment
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TextStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TextStyle.java
index 0cad4e7..2852e85 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TextStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TextStyle.java
@@ -11,18 +11,17 @@
  ****************************************************************************/
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Text Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Text
+ * Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.TextStyle#getTextAlignment <em>Text Alignment</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.TextStyle#getTextAlignment
+ * <em>Text Alignment</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getTextStyle()
  * @model
@@ -30,15 +29,16 @@
  */
 public interface TextStyle extends Style {
 	/**
-	 * Returns the value of the '<em><b>Text Alignment</b></em>' attribute.
-	 * The default value is <code>"Left"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.TextAlignment}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Text Alignment</b></em>' attribute. The
+	 * default value is <code>"Left"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.gmf.runtime.notation.TextAlignment}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Text Alignment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Text Alignment</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Text Alignment</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.TextAlignment
 	 * @see #setTextAlignment(TextAlignment)
@@ -49,9 +49,10 @@
 	TextAlignment getTextAlignment();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.TextStyle#getTextAlignment <em>Text Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.TextStyle#getTextAlignment <em>Text
+	 * Alignment</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Text Alignment</em>' attribute.
 	 * @see org.eclipse.gmf.runtime.notation.TextAlignment
 	 * @see #getTextAlignment()
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TitleStyle.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TitleStyle.java
index f956942..a90f815 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TitleStyle.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/TitleStyle.java
@@ -12,10 +12,9 @@
 
 package org.eclipse.gmf.runtime.notation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Title Style</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Title
+ * Style</b></em>'.
  * <p>
  * The title style is a style to be installed on views that have a title
  * </p>
@@ -23,10 +22,11 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.TitleStyle#isShowTitle <em>Show Title</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.TitleStyle#isShowTitle <em>Show
+ * Title</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getTitleStyle()
  * @model
@@ -36,11 +36,10 @@
  * @canBeSeenBy %partners
  */
 public interface TitleStyle extends Style {
-    /**
-	 * Returns the value of the '<em><b>Show Title</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Show Title</b></em>' attribute. The default
+	 * value is <code>"false"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Show Title</em>' attribute.
 	 * @see #setShowTitle(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getTitleStyle_ShowTitle()
@@ -49,10 +48,11 @@
 	 */
 	boolean isShowTitle();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.TitleStyle#isShowTitle <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.TitleStyle#isShowTitle <em>Show
+	 * Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Show Title</em>' attribute.
 	 * @see #isShowTitle()
 	 * @generated
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/View.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/View.java
index 83bb27d..5fce0ad 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/View.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/View.java
@@ -18,31 +18,41 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>View</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object
+ * '<em><b>View</b></em>'.
  * <p>
- * The views are the central abstraction in a notation model. View objects reference a business 
- * model and contain other notation objects that together hold all the properties needed to 
- * visualize that business model. The reason the view object does not have all the properties 
- * itself but rather delegates to other abstractions is to allow for easy extension of properties.
+ * The views are the central abstraction in a notation model. View objects
+ * reference a business model and contain other notation objects that together
+ * hold all the properties needed to visualize that business model. The reason
+ * the view object does not have all the properties itself but rather delegates
+ * to other abstractions is to allow for easy extension of properties.
  * </p>
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#isVisible <em>Visible</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#isMutable <em>Mutable</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#getSourceEdges <em>Source Edges</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#getTargetEdges <em>Target Edges</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#getPersistedChildren <em>Persisted Children</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#getStyles <em>Styles</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#getDiagram <em>Diagram</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.View#getTransientChildren <em>Transient Children</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#isVisible
+ * <em>Visible</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#isMutable
+ * <em>Mutable</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#getSourceEdges <em>Source
+ * Edges</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#getTargetEdges <em>Target
+ * Edges</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#getPersistedChildren
+ * <em>Persisted Children</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#getStyles
+ * <em>Styles</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#getElement
+ * <em>Element</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#getDiagram
+ * <em>Diagram</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.View#getTransientChildren
+ * <em>Transient Children</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView()
  * @model abstract="true"
@@ -52,11 +62,10 @@
  * @canBeSeenBy %partners
  */
 public interface View extends EModelElement {
-    /**
-	 * Returns the value of the '<em><b>Visible</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Visible</b></em>' attribute. The default
+	 * value is <code>"true"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Visible</em>' attribute.
 	 * @see #setVisible(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_Visible()
@@ -65,26 +74,26 @@
 	 */
 	boolean isVisible();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.View#isVisible <em>Visible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.View#isVisible
+	 * <em>Visible</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Visible</em>' attribute.
 	 * @see #isVisible()
 	 * @generated
 	 */
 	void setVisible(boolean value);
 
-    /**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Type</b></em>' attribute. The default value
+	 * is <code>""</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * The view's type is a context-defined unique string representing the kind of the view. 
-	 * It is usually used if the view is a subview or if it is a top level view that does
-	 * not have a business model  
+	 * The view's type is a context-defined unique string representing the kind of
+	 * the view. It is usually used if the view is a subview or if it is a top level
+	 * view that does not have a business model
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_Type()
@@ -93,30 +102,31 @@
 	 */
 	String getType();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.View#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.View#getType
+	 * <em>Type</em>}' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * The view's type is a context-defined unique string representing the kind of the view. 
-	 * It is usually used if the view is a subview or if it is a top level view that does
-	 * not have a business model  
+	 * The view's type is a context-defined unique string representing the kind of
+	 * the view. It is usually used if the view is a subview or if it is a top level
+	 * view that does not have a business model
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Type</em>' attribute.
 	 * @see #getType()
 	 * @generated
 	 */
 	void setType(String value);
 
-    /**
-	 * Returns the value of the '<em><b>Mutable</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Mutable</b></em>' attribute. The default
+	 * value is <code>"false"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mutable</em>' attribute.
 	 * @see #setMutable(boolean)
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_Mutable()
@@ -125,62 +135,76 @@
 	 */
 	boolean isMutable();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.View#isMutable <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.View#isMutable
+	 * <em>Mutable</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Mutable</em>' attribute.
 	 * @see #isMutable()
 	 * @generated
 	 */
 	void setMutable(boolean value);
 
-    /**
-	 * Returns the value of the '<em><b>Source Edges</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Edge}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.runtime.notation.Edge#getSource <em>Source</em>}'.
+	/**
+	 * Returns the value of the '<em><b>Source Edges</b></em>' reference list. The
+	 * list contents are of type {@link org.eclipse.gmf.runtime.notation.Edge}. It
+	 * is bidirectional and its opposite is
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getSource <em>Source</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * The property is a list of zero or more outgoing edges from the view
 	 * </p>
-	 * <p><b>Must use only for addition/removal purposes. Otherwise check if feature is set first {@link #eIsSet(org.eclipse.emf.ecore.EStructuralFeature)}</b></p>
+	 * <p>
+	 * <b>Must use only for addition/removal purposes. Otherwise check if feature is
+	 * set first {@link #eIsSet(org.eclipse.emf.ecore.EStructuralFeature)}</b>
+	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source Edges</em>' reference list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_SourceEdges()
 	 * @see org.eclipse.gmf.runtime.notation.Edge#getSource
-	 * @model type="org.eclipse.gmf.runtime.notation.Edge" opposite="source" resolveProxies="false" transient="true"
+	 * @model type="org.eclipse.gmf.runtime.notation.Edge" opposite="source"
+	 *        resolveProxies="false" transient="true"
 	 * @generated
 	 */
 	EList getSourceEdges();
 
-    /**
-	 * Returns the value of the '<em><b>Target Edges</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Edge}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.runtime.notation.Edge#getTarget <em>Target</em>}'.
+	/**
+	 * Returns the value of the '<em><b>Target Edges</b></em>' reference list. The
+	 * list contents are of type {@link org.eclipse.gmf.runtime.notation.Edge}. It
+	 * is bidirectional and its opposite is
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge#getTarget <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * The property is a list of zero or more incoming edges to the view
-	 * <p><b>Must use only for addition/removal purposes. Otherwise check if feature is set firts {@link #eIsSet(org.eclipse.emf.ecore.EStructuralFeature)}</b></p>
+	 * <p>
+	 * <b>Must use only for addition/removal purposes. Otherwise check if feature is
+	 * set firts {@link #eIsSet(org.eclipse.emf.ecore.EStructuralFeature)}</b>
+	 * </p>
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Edges</em>' reference list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_TargetEdges()
 	 * @see org.eclipse.gmf.runtime.notation.Edge#getTarget
-	 * @model type="org.eclipse.gmf.runtime.notation.Edge" opposite="target" resolveProxies="false" transient="true"
+	 * @model type="org.eclipse.gmf.runtime.notation.Edge" opposite="target"
+	 *        resolveProxies="false" transient="true"
 	 * @generated
 	 */
 	EList getTargetEdges();
 
-    /**
-	 * Returns the value of the '<em><b>Persisted Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Node}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Persisted Children</b></em>' containment
+	 * reference list. The list contents are of type
+	 * {@link org.eclipse.gmf.runtime.notation.Node}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Persisted Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Persisted Children</em>' containment reference
+	 * list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Persisted Children</em>' containment reference list.
+	 * 
+	 * @return the value of the '<em>Persisted Children</em>' containment reference
+	 *         list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_PersistedChildren()
 	 * @model type="org.eclipse.gmf.runtime.notation.Node" containment="true"
 	 * @generated
@@ -188,35 +212,38 @@
 	EList getPersistedChildren();
 
 	/**
-	 * Returns the value of the '<em><b>Children</b></em>'list.
-	 * the returned list is an <em><b>Unmodifable</b></em> list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.View}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>Children</b></em>'list. the returned list is
+	 * an <em><b>Unmodifable</b></em> list. The list contents are of type
+	 * {@link org.eclipse.gmf.runtime.notation.View}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Children</em>' list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_Children()
 	 */
 	EList getChildren();
-	
+
 	/**
-	 * Returns an <em><b>Unmodifable</b></em> list that contains all the 
-	 * visible children in the Children list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.View}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns an <em><b>Unmodifable</b></em> list that contains all the visible
+	 * children in the Children list. The list contents are of type
+	 * {@link org.eclipse.gmf.runtime.notation.View}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return <em><b>Unmodifable</b></em> list of Visible children
 	 */
 	EList getVisibleChildren();
 
-    /**
+	/**
 	 * Returns the value of the '<em><b>Styles</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Style}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * The list contains unique instances of these styles.
-	 * <p><b>Must use {@link #getStyle(EClass)} to access specific style</b></p>
+	 * <p>
+	 * <b>Must use {@link #getStyle(EClass)} to access specific style</b>
+	 * </p>
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Styles</em>' containment reference list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_Styles()
 	 * @model type="org.eclipse.gmf.runtime.notation.Style" containment="true"
@@ -224,13 +251,14 @@
 	 */
 	EList getStyles();
 
-    /**
-	 * Returns the value of the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' reference. <!--
+	 * begin-user-doc -->
 	 * <p>
 	 * This is The referenced business model element
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Element</em>' reference.
 	 * @see #isSetElement()
 	 * @see #unsetElement()
@@ -241,11 +269,12 @@
 	 */
 	EObject getElement();
 
-    /**
-	 * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * This is The referenced business model element
-	 * <!-- end-user-doc -->
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}'
+	 * reference. <!-- begin-user-doc --> This is The referenced business model
+	 * element <!-- end-user-doc -->
+	 * 
 	 * @param value the new value of the '<em>Element</em>' reference.
 	 * @see #isSetElement()
 	 * @see #unsetElement()
@@ -254,10 +283,11 @@
 	 */
 	void setElement(EObject value);
 
-    /**
-	 * Unsets the value of the '{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Unsets the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetElement()
 	 * @see #getElement()
 	 * @see #setElement(EObject)
@@ -265,10 +295,11 @@
 	 */
 	void unsetElement();
 
-				/**
-	 * Returns whether the value of the '{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns whether the value of the
+	 * '{@link org.eclipse.gmf.runtime.notation.View#getElement <em>Element</em>}'
+	 * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Element</em>' reference is set.
 	 * @see #unsetElement()
 	 * @see #getElement()
@@ -277,13 +308,14 @@
 	 */
 	boolean isSetElement();
 
-				/**
-	 * Returns the value of the '<em><b>Diagram</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Diagram</b></em>' reference. <!--
+	 * begin-user-doc -->
 	 * <p>
 	 * The diagram is the top level container of this view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Diagram</em>' reference.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_Diagram()
 	 * @model required="true" transient="true" changeable="false" volatile="true"
@@ -291,66 +323,72 @@
 	 */
 	Diagram getDiagram();
 
-    /**
-	 * Returns the value of the '<em><b>Transient Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Node}.
-	 * <!-- begin-user-doc -->
+	/**
+	 * Returns the value of the '<em><b>Transient Children</b></em>' containment
+	 * reference list. The list contents are of type
+	 * {@link org.eclipse.gmf.runtime.notation.Node}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Transient Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Transient Children</em>' containment reference
+	 * list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transient Children</em>' containment reference list.
+	 * 
+	 * @return the value of the '<em>Transient Children</em>' containment reference
+	 *         list.
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#getView_TransientChildren()
-	 * @model type="org.eclipse.gmf.runtime.notation.Node" containment="true" transient="true"
+	 * @model type="org.eclipse.gmf.runtime.notation.Node" containment="true"
+	 *        transient="true"
 	 * @generated
 	 */
 	EList getTransientChildren();
 
-    /**
+	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * Looks up a style in the view's collection of styles that extends/implements
-	 * the given <code>EClass</code>. Thefore the returned style instance is not guaranteed
-	 * to be unique for different <code>EClass</code>es 
+	 * the given <code>EClass</code>. Thefore the returned style instance is not
+	 * guaranteed to be unique for different <code>EClass</code>es
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
 	Style getStyle(EClass eClass);
 
-    /**
+	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A utililty method to create a new <code>Node</code> from the given <code>eClass</code> paramter
-	 * and then inserts the object in the view's </em>Children</em> collection
+	 * A utililty method to create a new <code>Node</code> from the given
+	 * <code>eClass</code> paramter and then inserts the object in the view's
+	 * </em>Children</em> collection
 	 * </p>
 	 * 
-	 * @param eClass the <code>EClass</code> to be used in creating the <code>Node</code> object
-	 * <!-- end-user-doc -->
+	 * @param eClass the <code>EClass</code> to be used in creating the
+	 *               <code>Node</code> object <!-- end-user-doc -->
 	 * @model
 	 * @generated
 	 */
 	Node createChild(EClass eClass);
 
-    /**
+	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A utililty method to create a new <code>Style</code> from the given <code>eClass</code> paramter
-	 * and then inserts the object in the view's </em>Styles</em> collection
+	 * A utililty method to create a new <code>Style</code> from the given
+	 * <code>eClass</code> paramter and then inserts the object in the view's
+	 * </em>Styles</em> collection
 	 * </p>
 	 * 
-	 * @param eClass the <code>EClass</code> to be used in creating the <code>Style</code> object
-	 * <!-- end-user-doc -->
+	 * @param eClass the <code>EClass</code> to be used in creating the
+	 *               <code>Style</code> object <!-- end-user-doc -->
 	 * @model
 	 * @generated
 	 */
 	Style createStyle(EClass eClass);
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @model
 	 * @generated
 	 */
@@ -364,56 +402,57 @@
 	 * <!-- end-user-doc -->
 	 */
 	void persistChildren();
-	
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * A utililty method to persist the view, it will do nothing if the view is alrady peristed
+	 * A utililty method to persist the view, it will do nothing if the view is
+	 * alrady peristed
 	 * </p>
 	 * <!-- end-user-doc -->
 	 */
 	void persist();
-	
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * A utililty method to insert a persisted child
 	 * </p>
-	 * @param child the '<em>View</em>' to insert.
-	 * <!-- end-user-doc -->
+	 * 
+	 * @param child the '<em>View</em>' to insert. <!-- end-user-doc -->
 	 */
 	void insertChild(View child);
-	
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * A utililty method to insert a persisted child at a specific index
 	 * </p>
+	 * 
 	 * @param child the '<em>View</em>' to insert.
-	 * @param the index of the child
-	 * <!-- end-user-doc -->
+	 * @param the   index of the child <!-- end-user-doc -->
 	 */
 	void insertChildAt(View child, int index);
-	
-	
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * A utililty method to insert a persisted or transient child
 	 * </p>
-	 * @param child the '<em>View</em>' to insert.
-	 * @param persisted, indicate if the view will be persisted or not
-	 * <!-- end-user-doc -->
+	 * 
+	 * @param child      the '<em>View</em>' to insert.
+	 * @param persisted, indicate if the view will be persisted or not <!--
+	 *                   end-user-doc -->
 	 */
-	void insertChild(View child,boolean persisted);
-	
+	void insertChild(View child, boolean persisted);
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * A utililty method to remove a child form a view
 	 * </p>
-	 * @param child the '<em>View</em>' to remove
-	 * <!-- end-user-doc -->
+	 * 
+	 * @param child the '<em>View</em>' to remove <!-- end-user-doc -->
 	 */
 	void removeChild(View child);
 } // View
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/datatype/GradientData.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/datatype/GradientData.java
index 51bbf46..d5d868c 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/datatype/GradientData.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/datatype/GradientData.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.gmf.runtime.notation.GradientStyle;
 
-
 /**
  * Class defining gradient data
  * 
@@ -23,26 +22,25 @@
  * @since 1.2
  */
 public class GradientData {
-	protected static final int GRADIENT_COLOR1_DEFFAULT = 8421504; //dark grey
-	
+	protected static final int GRADIENT_COLOR1_DEFFAULT = 8421504; // dark grey
+
 	protected static final int GRADIENT_COLOR2_DEFFAULT = 16777215; // white
-	
-	protected static final int GRADIENT_STYLE_DEFAULT = GradientStyle.VERTICAL;			
-	
+
+	protected static final int GRADIENT_STYLE_DEFAULT = GradientStyle.VERTICAL;
+
 	private int gradientColor1 = GRADIENT_COLOR1_DEFFAULT;
-	
+
 	private int gradientColor2 = GRADIENT_COLOR2_DEFFAULT;
-	
+
 	private int gradientStyle = GRADIENT_STYLE_DEFAULT;
-	
-	private static final GradientData defaultGradientData = 
-		new GradientData(GRADIENT_COLOR1_DEFFAULT, GRADIENT_COLOR2_DEFFAULT, GRADIENT_STYLE_DEFAULT);
-	
-	
+
+	private static final GradientData defaultGradientData = new GradientData(GRADIENT_COLOR1_DEFFAULT,
+			GRADIENT_COLOR2_DEFFAULT, GRADIENT_STYLE_DEFAULT);
+
 	public GradientData() {
 		super();
 	}
-	
+
 	public GradientData(int color1, int color2, int style) {
 		gradientColor1 = color1;
 		gradientColor2 = color2;
@@ -50,7 +48,7 @@
 			gradientStyle = style;
 		}
 	}
-	
+
 	public GradientData(GradientData data) {
 		if (data != null) {
 			gradientColor1 = data.getGradientColor1();
@@ -58,11 +56,11 @@
 			gradientStyle = data.getGradientStyle();
 		}
 	}
-	
+
 	public static GradientData getDefaultGradientData() {
 		return defaultGradientData;
 	}
-		
+
 	/**
 	 * @return the gradientColor1
 	 */
@@ -99,15 +97,16 @@
 	}
 
 	/**
-	 * @param gradientStyle the gradientStyle to set. true is for vertical, false is for horizontal 
+	 * @param gradientStyle the gradientStyle to set. true is for vertical, false is
+	 *                      for horizontal
 	 */
 	public void setGradientStyle(int gradientStyle) {
-		//TEMP code: temporarily commented; replace when new notation is in place 
-		//if (GradientStyle.get(gradientStyle) != null) {
-			this.gradientStyle = gradientStyle;
-		//}
+		// TEMP code: temporarily commented; replace when new notation is in place
+		// if (GradientStyle.get(gradientStyle) != null) {
+		this.gradientStyle = gradientStyle;
+		// }
 	}
-		
+
 	public String toString() {
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (gradientColor1: "); //$NON-NLS-1$
@@ -120,7 +119,9 @@
 		return result.toString();
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see java.lang.Object#hashCode()
 	 */
 	public int hashCode() {
@@ -132,7 +133,9 @@
 		return result;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	public boolean equals(Object obj) {
@@ -151,7 +154,5 @@
 			return false;
 		return true;
 	}
-	
-	
-}
 
+}
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/datatype/RelativeBendpoint.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/datatype/RelativeBendpoint.java
index 1f3e793..808a284 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/datatype/RelativeBendpoint.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/datatype/RelativeBendpoint.java
@@ -16,20 +16,24 @@
 import java.util.StringTokenizer;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Relative Bendpoint</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Relative Bendpoint</b></em>'.
  * <p>
- * A type of bendpoints representing a collection of points with relative distances 
- * along the x- and y-axis to the source and target views of an edge
+ * A type of bendpoints representing a collection of points with relative
+ * distances along the x- and y-axis to the source and target views of an edge
  * </p>
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointImpl#getSourceX <em>Source X</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointImpl#getSourceY <em>Source Y</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointImpl#getTargetX <em>Target X</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointImpl#getTargetY <em>Target Y</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointImpl#getSourceX
+ * <em>Source X</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointImpl#getSourceY
+ * <em>Source Y</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointImpl#getTargetX
+ * <em>Target X</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointImpl#getTargetY
+ * <em>Target Y</em>}</li>
  * </ul>
  * </p>
  *
@@ -41,8 +45,8 @@
 public class RelativeBendpoint {
 	/**
 	 * The default value of the '{@link #getSourceX() <em>Source X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceX()
 	 * @generated
 	 * @ordered
@@ -51,8 +55,8 @@
 
 	/**
 	 * The cached value of the '{@link #getSourceX() <em>Source X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceX()
 	 * @generated
 	 * @ordered
@@ -61,8 +65,8 @@
 
 	/**
 	 * The default value of the '{@link #getSourceY() <em>Source Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceY()
 	 * @generated
 	 * @ordered
@@ -71,8 +75,8 @@
 
 	/**
 	 * The cached value of the '{@link #getSourceY() <em>Source Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceY()
 	 * @generated
 	 * @ordered
@@ -81,8 +85,8 @@
 
 	/**
 	 * The default value of the '{@link #getTargetX() <em>Target X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetX()
 	 * @generated
 	 * @ordered
@@ -91,8 +95,8 @@
 
 	/**
 	 * The cached value of the '{@link #getTargetX() <em>Target X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetX()
 	 * @generated
 	 * @ordered
@@ -101,8 +105,8 @@
 
 	/**
 	 * The default value of the '{@link #getTargetY() <em>Target Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetY()
 	 * @generated
 	 * @ordered
@@ -111,8 +115,8 @@
 
 	/**
 	 * The cached value of the '{@link #getTargetY() <em>Target Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetY()
 	 * @generated
 	 * @ordered
@@ -120,12 +124,12 @@
 	protected int targetY = TARGET_Y_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RelativeBendpoint(String string) {
-		StringTokenizer t = new StringTokenizer(string.substring(1, string.length()-1), ","); //$NON-NLS-1$
+		StringTokenizer t = new StringTokenizer(string.substring(1, string.length() - 1), ","); //$NON-NLS-1$
 		setSourceX(Integer.parseInt(t.nextToken().trim()));
 		setSourceY(Integer.parseInt(t.nextToken().trim()));
 		setTargetX(Integer.parseInt(t.nextToken().trim()));
@@ -133,8 +137,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RelativeBendpoint() {
@@ -142,8 +146,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RelativeBendpoint(int sourceX, int sourceY, int targetX, int targetY) {
@@ -156,10 +160,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * Returns the x-distance from the bendpoint to 
-	 * the attach point with the source view
+	 * Returns the x-distance from the bendpoint to the attach point with the source
+	 * view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getSourceX() {
@@ -169,10 +174,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * Sets the x-distance from the bendpoint to 
-	 * the attach point with the source view
+	 * Sets the x-distance from the bendpoint to the attach point with the source
+	 * view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void setSourceX(int newSourceX) {
@@ -182,10 +188,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * Returns the y-distance from the bendpoint to 
-	 * the attach point with the source view
+	 * Returns the y-distance from the bendpoint to the attach point with the source
+	 * view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getSourceY() {
@@ -195,10 +202,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * Sets the y-distance from the bendpoint to 
-	 * the attach point with the source view
+	 * Sets the y-distance from the bendpoint to the attach point with the source
+	 * view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void setSourceY(int newSourceY) {
@@ -208,10 +216,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * Returns the x-distance from the bendpoint to 
-	 * the attach point with the target view
+	 * Returns the x-distance from the bendpoint to the attach point with the target
+	 * view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getTargetX() {
@@ -221,10 +230,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * Sets the x-distance from the bendpoint to 
-	 * the attach point with the target view
+	 * Sets the x-distance from the bendpoint to the attach point with the target
+	 * view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void setTargetX(int newTargetX) {
@@ -234,10 +244,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * Returns the y-distance from the bendpoint to 
-	 * the attach point with the target view
+	 * Returns the y-distance from the bendpoint to the attach point with the target
+	 * view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getTargetY() {
@@ -247,10 +258,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * Sets the y-distance from the bendpoint to 
-	 * the attach point with the target view
+	 * Sets the y-distance from the bendpoint to the attach point with the target
+	 * view
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void setTargetY(int newTargetY) {
@@ -258,8 +270,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
@@ -277,8 +289,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertToString() {
@@ -295,7 +307,9 @@
 		return result.toString();
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see java.lang.Object#hashCode()
 	 */
 	public int hashCode() {
@@ -308,7 +322,9 @@
 		return result;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	public boolean equals(Object obj) {
@@ -329,5 +345,5 @@
 			return false;
 		return true;
 	}
-	
-} //RelativeBendpointImpl
+
+} // RelativeBendpointImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ArrowStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ArrowStyleImpl.java
index 5ae150a..9f10bd5 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ArrowStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ArrowStyleImpl.java
@@ -20,31 +20,33 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Arrow Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Arrow
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl#getArrowSource <em>Arrow Source</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl#getArrowTarget <em>Arrow Target</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl#getArrowSource
+ * <em>Arrow Source</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl#getArrowTarget
+ * <em>Arrow Target</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class ArrowStyleImpl extends MinimalEObjectImpl.Container implements ArrowStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
+
 	/**
-	 * The default value of the '{@link #getArrowSource() <em>Arrow Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getArrowSource() <em>Arrow Source</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getArrowSource()
 	 * @generated
 	 * @ordered
@@ -52,36 +54,40 @@
 	protected static final ArrowType ARROW_SOURCE_EDEFAULT = ArrowType.NONE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getArrowSource() <em>Arrow Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the
+	 * '{@link #getArrowSource() <em>Arrow Source</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ARROW_SOURCE_EFLAG_OFFSET = 8;
 
 	/**
-	 * The flags representing the default value of the '{@link #getArrowSource() <em>Arrow Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getArrowSource()
+	 * <em>Arrow Source</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int ARROW_SOURCE_EFLAG_DEFAULT = ArrowType.VALUES.indexOf(ARROW_SOURCE_EDEFAULT) << ARROW_SOURCE_EFLAG_OFFSET;
+	protected static final int ARROW_SOURCE_EFLAG_DEFAULT = ArrowType.VALUES
+			.indexOf(ARROW_SOURCE_EDEFAULT) << ARROW_SOURCE_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link ArrowType Arrow Type}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link ArrowType Arrow Type}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final ArrowType[] ARROW_SOURCE_EFLAG_VALUES = (ArrowType[])ArrowType.VALUES.toArray(new ArrowType[ArrowType.VALUES.size()]);
+	private static final ArrowType[] ARROW_SOURCE_EFLAG_VALUES = (ArrowType[]) ArrowType.VALUES
+			.toArray(new ArrowType[ArrowType.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getArrowSource() <em>Arrow Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getArrowSource() <em>Arrow
+	 * Source</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getArrowSource()
 	 * @generated
 	 * @ordered
@@ -89,9 +95,9 @@
 	protected static final int ARROW_SOURCE_EFLAG = 0x3 << ARROW_SOURCE_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #getArrowTarget() <em>Arrow Target</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getArrowTarget() <em>Arrow Target</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getArrowTarget()
 	 * @generated
 	 * @ordered
@@ -99,36 +105,40 @@
 	protected static final ArrowType ARROW_TARGET_EDEFAULT = ArrowType.NONE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getArrowTarget() <em>Arrow Target</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the
+	 * '{@link #getArrowTarget() <em>Arrow Target</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ARROW_TARGET_EFLAG_OFFSET = 10;
 
 	/**
-	 * The flags representing the default value of the '{@link #getArrowTarget() <em>Arrow Target</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getArrowTarget()
+	 * <em>Arrow Target</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int ARROW_TARGET_EFLAG_DEFAULT = ArrowType.VALUES.indexOf(ARROW_TARGET_EDEFAULT) << ARROW_TARGET_EFLAG_OFFSET;
+	protected static final int ARROW_TARGET_EFLAG_DEFAULT = ArrowType.VALUES
+			.indexOf(ARROW_TARGET_EDEFAULT) << ARROW_TARGET_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link ArrowType Arrow Type}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link ArrowType Arrow Type}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final ArrowType[] ARROW_TARGET_EFLAG_VALUES = (ArrowType[])ArrowType.VALUES.toArray(new ArrowType[ArrowType.VALUES.size()]);
+	private static final ArrowType[] ARROW_TARGET_EFLAG_VALUES = (ArrowType[]) ArrowType.VALUES
+			.toArray(new ArrowType[ArrowType.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getArrowTarget() <em>Arrow Target</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getArrowTarget() <em>Arrow
+	 * Target</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getArrowTarget()
 	 * @generated
 	 * @ordered
@@ -136,8 +146,8 @@
 	protected static final int ARROW_TARGET_EFLAG = 0x3 << ARROW_TARGET_EFLAG_OFFSET;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ArrowStyleImpl() {
@@ -145,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -154,8 +164,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArrowType getArrowSource() {
@@ -163,21 +173,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setArrowSource(ArrowType newArrowSource) {
-		ArrowType oldArrowSource = ARROW_SOURCE_EFLAG_VALUES[(eFlags & ARROW_SOURCE_EFLAG) >>> ARROW_SOURCE_EFLAG_OFFSET];
-		if (newArrowSource == null) newArrowSource = ARROW_SOURCE_EDEFAULT;
+		ArrowType oldArrowSource = ARROW_SOURCE_EFLAG_VALUES[(eFlags
+				& ARROW_SOURCE_EFLAG) >>> ARROW_SOURCE_EFLAG_OFFSET];
+		if (newArrowSource == null)
+			newArrowSource = ARROW_SOURCE_EDEFAULT;
 		eFlags = eFlags & ~ARROW_SOURCE_EFLAG | ArrowType.VALUES.indexOf(newArrowSource) << ARROW_SOURCE_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ARROW_STYLE__ARROW_SOURCE, oldArrowSource, newArrowSource));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ARROW_STYLE__ARROW_SOURCE,
+					oldArrowSource, newArrowSource));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArrowType getArrowTarget() {
@@ -185,89 +198,93 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setArrowTarget(ArrowType newArrowTarget) {
-		ArrowType oldArrowTarget = ARROW_TARGET_EFLAG_VALUES[(eFlags & ARROW_TARGET_EFLAG) >>> ARROW_TARGET_EFLAG_OFFSET];
-		if (newArrowTarget == null) newArrowTarget = ARROW_TARGET_EDEFAULT;
+		ArrowType oldArrowTarget = ARROW_TARGET_EFLAG_VALUES[(eFlags
+				& ARROW_TARGET_EFLAG) >>> ARROW_TARGET_EFLAG_OFFSET];
+		if (newArrowTarget == null)
+			newArrowTarget = ARROW_TARGET_EDEFAULT;
 		eFlags = eFlags & ~ARROW_TARGET_EFLAG | ArrowType.VALUES.indexOf(newArrowTarget) << ARROW_TARGET_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ARROW_STYLE__ARROW_TARGET, oldArrowTarget, newArrowTarget));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ARROW_STYLE__ARROW_TARGET,
+					oldArrowTarget, newArrowTarget));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.ARROW_STYLE__ARROW_SOURCE:
-				return getArrowSource();
-			case NotationPackage.ARROW_STYLE__ARROW_TARGET:
-				return getArrowTarget();
+		case NotationPackage.ARROW_STYLE__ARROW_SOURCE:
+			return getArrowSource();
+		case NotationPackage.ARROW_STYLE__ARROW_TARGET:
+			return getArrowTarget();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.ARROW_STYLE__ARROW_SOURCE:
-				setArrowSource((ArrowType)newValue);
-				return;
-			case NotationPackage.ARROW_STYLE__ARROW_TARGET:
-				setArrowTarget((ArrowType)newValue);
-				return;
+		case NotationPackage.ARROW_STYLE__ARROW_SOURCE:
+			setArrowSource((ArrowType) newValue);
+			return;
+		case NotationPackage.ARROW_STYLE__ARROW_TARGET:
+			setArrowTarget((ArrowType) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.ARROW_STYLE__ARROW_SOURCE:
-				setArrowSource(ARROW_SOURCE_EDEFAULT);
-				return;
-			case NotationPackage.ARROW_STYLE__ARROW_TARGET:
-				setArrowTarget(ARROW_TARGET_EDEFAULT);
-				return;
+		case NotationPackage.ARROW_STYLE__ARROW_SOURCE:
+			setArrowSource(ARROW_SOURCE_EDEFAULT);
+			return;
+		case NotationPackage.ARROW_STYLE__ARROW_TARGET:
+			setArrowTarget(ARROW_TARGET_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.ARROW_STYLE__ARROW_SOURCE:
-				return (eFlags & ARROW_SOURCE_EFLAG) != ARROW_SOURCE_EFLAG_DEFAULT;
-			case NotationPackage.ARROW_STYLE__ARROW_TARGET:
-				return (eFlags & ARROW_TARGET_EFLAG) != ARROW_TARGET_EFLAG_DEFAULT;
+		case NotationPackage.ARROW_STYLE__ARROW_SOURCE:
+			return (eFlags & ARROW_SOURCE_EFLAG) != ARROW_SOURCE_EFLAG_DEFAULT;
+		case NotationPackage.ARROW_STYLE__ARROW_TARGET:
+			return (eFlags & ARROW_TARGET_EFLAG) != ARROW_TARGET_EFLAG_DEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (arrowSource: "); //$NON-NLS-1$
@@ -278,4 +295,4 @@
 		return result.toString();
 	}
 
-} //ArrowStyleImpl
+} // ArrowStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicCompartmentImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicCompartmentImpl.java
index e282d44..f58447b 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicCompartmentImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicCompartmentImpl.java
@@ -24,24 +24,24 @@
 import org.eclipse.gmf.runtime.notation.Style;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Basic Compartment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Basic
+ * Compartment</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl#isCollapsed <em>Collapsed</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl#isCollapsed
+ * <em>Collapsed</em>}</li>
+ * </ul>
  *
  * @generated
  * @since 1.2
  */
 public class BasicCompartmentImpl extends DecorationNodeImpl implements BasicCompartment {
 	/**
-	 * The default value of the '{@link #isCollapsed() <em>Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isCollapsed() <em>Collapsed</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCollapsed()
 	 * @generated
 	 * @ordered
@@ -49,9 +49,9 @@
 	protected static final boolean COLLAPSED_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isCollapsed() <em>Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isCollapsed()
+	 * <em>Collapsed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCollapsed()
 	 * @generated
 	 * @ordered
@@ -59,8 +59,8 @@
 	protected static final int COLLAPSED_EFLAG = 1 << 11;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BasicCompartmentImpl() {
@@ -68,8 +68,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -77,8 +77,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isCollapsed() {
@@ -86,284 +86,297 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCollapsed(boolean newCollapsed) {
 		boolean oldCollapsed = (eFlags & COLLAPSED_EFLAG) != 0;
-		if (newCollapsed) eFlags |= COLLAPSED_EFLAG; else eFlags &= ~COLLAPSED_EFLAG;
+		if (newCollapsed)
+			eFlags |= COLLAPSED_EFLAG;
+		else
+			eFlags &= ~COLLAPSED_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BASIC_COMPARTMENT__COLLAPSED, oldCollapsed, newCollapsed));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BASIC_COMPARTMENT__COLLAPSED,
+					oldCollapsed, newCollapsed));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.BASIC_COMPARTMENT__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.BASIC_COMPARTMENT__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.BASIC_COMPARTMENT__TYPE:
-				return getType();
-			case NotationPackage.BASIC_COMPARTMENT__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.BASIC_COMPARTMENT__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.BASIC_COMPARTMENT__STYLES:
-				return getStyles();
-			case NotationPackage.BASIC_COMPARTMENT__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.BASIC_COMPARTMENT__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.BASIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.BASIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
-			case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
-				return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BASIC_COMPARTMENT__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.BASIC_COMPARTMENT__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BASIC_COMPARTMENT__TYPE:
+			return getType();
+		case NotationPackage.BASIC_COMPARTMENT__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.BASIC_COMPARTMENT__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.BASIC_COMPARTMENT__STYLES:
+			return getStyles();
+		case NotationPackage.BASIC_COMPARTMENT__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.BASIC_COMPARTMENT__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.BASIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.BASIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
+		case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
+			return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
-				return;
-			default:
-				eSetGen(featureID, newValue);
+		case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
+			return;
+		default:
+			eSetGen(featureID, newValue);
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSetGen(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BASIC_COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)newValue);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
-				setCollapsed(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.BASIC_COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) newValue);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
+			setCollapsed(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
-				return;
-			default:
-				eUnsetGen(featureID);
+		case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
+			return;
+		default:
+			eUnsetGen(featureID);
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnsetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)null);
-				return;
-			case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
-				setCollapsed(COLLAPSED_EDEFAULT);
-				return;
+		case NotationPackage.BASIC_COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) null);
+			return;
+		case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
+			setCollapsed(COLLAPSED_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
-				return false;
-			default:
-				return eIsSetGen(featureID);
+		case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
+			return false;
+		default:
+			return eIsSetGen(featureID);
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT_CDO
 	 */
 	public boolean eIsSetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_COMPARTMENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.BASIC_COMPARTMENT__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.BASIC_COMPARTMENT__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.BASIC_COMPARTMENT__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
-				return false;
-			case NotationPackage.BASIC_COMPARTMENT__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.BASIC_COMPARTMENT__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.BASIC_COMPARTMENT__ELEMENT:
-				return isSetElement();
-			case NotationPackage.BASIC_COMPARTMENT__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.BASIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.BASIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return layoutConstraint != null;
-			case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
-				return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
+		case NotationPackage.BASIC_COMPARTMENT__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.BASIC_COMPARTMENT__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.BASIC_COMPARTMENT__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.BASIC_COMPARTMENT__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.BASIC_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.BASIC_COMPARTMENT__TARGET_EDGES:
+			return false;
+		case NotationPackage.BASIC_COMPARTMENT__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.BASIC_COMPARTMENT__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.BASIC_COMPARTMENT__ELEMENT:
+			return isSetElement();
+		case NotationPackage.BASIC_COMPARTMENT__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.BASIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.BASIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return layoutConstraint != null;
+		case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
+			return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DrawerStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.BASIC_COMPARTMENT__COLLAPSED: return NotationPackage.DRAWER_STYLE__COLLAPSED;
-				default: return -1;
+			case NotationPackage.BASIC_COMPARTMENT__COLLAPSED:
+				return NotationPackage.DRAWER_STYLE__COLLAPSED;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DrawerStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.DRAWER_STYLE__COLLAPSED: return NotationPackage.BASIC_COMPARTMENT__COLLAPSED;
-				default: return -1;
+			case NotationPackage.DRAWER_STYLE__COLLAPSED:
+				return NotationPackage.BASIC_COMPARTMENT__COLLAPSED;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (collapsed: "); //$NON-NLS-1$
@@ -372,4 +385,4 @@
 		return result.toString();
 	}
 
-} //BasicCompartmentImpl
+} // BasicCompartmentImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicDecorationNodeImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicDecorationNodeImpl.java
index 9f488a9..1c47ce7 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicDecorationNodeImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicDecorationNodeImpl.java
@@ -31,7 +31,6 @@
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.gmf.runtime.notation.BasicDecorationNode;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;
 import org.eclipse.gmf.runtime.notation.NamedStyle;
 import org.eclipse.gmf.runtime.notation.Node;
@@ -40,9 +39,8 @@
 import org.eclipse.gmf.runtime.notation.View;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Basic Decoration Node</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Basic
+ * Decoration Node</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
  *
@@ -50,26 +48,26 @@
  * @since 1.2
  */
 public class BasicDecorationNodeImpl extends EModelElementImpl implements BasicDecorationNode {
-	
-    protected static final boolean VISIBLE_EDEFAULT = true;
 
-    protected static final int VISIBLE_EFLAG = 1 << 8;
+	protected static final boolean VISIBLE_EDEFAULT = true;
 
-    protected static final String TYPE_EDEFAULT = ""; //$NON-NLS-1$
+	protected static final int VISIBLE_EFLAG = 1 << 8;
 
-    protected String type = TYPE_EDEFAULT;
+	protected static final String TYPE_EDEFAULT = ""; //$NON-NLS-1$
 
-    protected static final boolean MUTABLE_EDEFAULT = false;
+	protected String type = TYPE_EDEFAULT;
 
-    protected static final int MUTABLE_EFLAG = 1 << 9;
+	protected static final boolean MUTABLE_EDEFAULT = false;
 
-    protected EObject element;
+	protected static final int MUTABLE_EFLAG = 1 << 9;
 
-	protected static final int ELEMENT_ESETFLAG = 1 << 10; 
+	protected EObject element;
+
+	protected static final int ELEMENT_ESETFLAG = 1 << 10;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	protected BasicDecorationNodeImpl() {
@@ -78,108 +76,114 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.BASIC_DECORATION_NODE;
 	}
 
-    // EATM
-    // private EContentsEList allChildren = null;
+	// EATM
+	// private EContentsEList allChildren = null;
 
-    protected static final EStructuralFeature[] childrenFeatures = new EStructuralFeature[] {
-        NotationPackage.Literals.VIEW__PERSISTED_CHILDREN,
-        NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN};
+	protected static final EStructuralFeature[] childrenFeatures = new EStructuralFeature[] {
+			NotationPackage.Literals.VIEW__PERSISTED_CHILDREN, NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN };
 
-    public boolean isVisible() {
+	public boolean isVisible() {
 		return (eFlags & VISIBLE_EFLAG) != 0;
 	}
 
-    public void setVisible(boolean newVisible) {
+	public void setVisible(boolean newVisible) {
 		boolean oldVisible = (eFlags & VISIBLE_EFLAG) != 0;
-		if (newVisible) eFlags |= VISIBLE_EFLAG; else eFlags &= ~VISIBLE_EFLAG;
+		if (newVisible)
+			eFlags |= VISIBLE_EFLAG;
+		else
+			eFlags &= ~VISIBLE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__VISIBLE, oldVisible, newVisible));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__VISIBLE, oldVisible,
+					newVisible));
 	}
 
-    public String getType() {
+	public String getType() {
 		return type;
 	}
 
-    public void setType(String newType) {
-        String oldType = type;
-        type = (newType == null) ? null
-            : newType.intern();
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET,
-                NotationPackage.VIEW__TYPE, oldType, type));
-    }
+	public void setType(String newType) {
+		String oldType = type;
+		type = (newType == null) ? null : newType.intern();
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__TYPE, oldType, type));
+	}
 
-    public boolean isMutable() {
+	public boolean isMutable() {
 		return (eFlags & MUTABLE_EFLAG) != 0;
 	}
 
-    public void setMutable(boolean newMutable) {
+	public void setMutable(boolean newMutable) {
 		boolean oldMutable = (eFlags & MUTABLE_EFLAG) != 0;
-		if (newMutable) eFlags |= MUTABLE_EFLAG; else eFlags &= ~MUTABLE_EFLAG;
+		if (newMutable)
+			eFlags |= MUTABLE_EFLAG;
+		else
+			eFlags &= ~MUTABLE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__MUTABLE, oldMutable, newMutable));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__MUTABLE, oldMutable,
+					newMutable));
 	}
 
-    public EList getSourceEdges() {
-        return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_SourceEdges(), 0, null);
+	public EList getSourceEdges() {
+		return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_SourceEdges(), 0, null);
 	}
 
-    public EList getTargetEdges() {
-        return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_TargetEdges(), 0, null);
+	public EList getTargetEdges() {
+		return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_TargetEdges(), 0, null);
 	}
 
-    public EList getPersistedChildren() {
-        return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_PersistedChildren(), 0, null);
+	public EList getPersistedChildren() {
+		return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_PersistedChildren(), 0, null);
 	}
 
-    public EList getChildren() {
-        return ECollections.emptyEList();
-    }
-
-    public EList getStyles() {
-        return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_TransientChildren(), 0, null);
+	public EList getChildren() {
+		return ECollections.emptyEList();
 	}
 
-    public EObject getElement() {
-        if (!isSetElement()) {
-            EObject container = eContainer();
-            if (container instanceof View) {
-                View view = (View) container;
-                element = view.getElement();
-            }
-        }
-        if (element != null && element.eIsProxy()) {
-            EObject oldElement = element;
-            element = eResolveProxy((InternalEObject) element);
-            if (element != oldElement) {
-                if (eNotificationRequired())
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-                        NotationPackage.VIEW__ELEMENT, oldElement, element));
-            }
-        }
+	public EList getStyles() {
+		return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_TransientChildren(), 0, null);
+	}
 
-        return element;
-    }
+	public EObject getElement() {
+		if (!isSetElement()) {
+			EObject container = eContainer();
+			if (container instanceof View) {
+				View view = (View) container;
+				element = view.getElement();
+			}
+		}
+		if (element != null && element.eIsProxy()) {
+			EObject oldElement = element;
+			element = eResolveProxy((InternalEObject) element);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NotationPackage.VIEW__ELEMENT, oldElement,
+							element));
+			}
+		}
 
-    public EObject basicGetElement() {
 		return element;
 	}
 
-    public void setElement(EObject newElement) {
+	public EObject basicGetElement() {
+		return element;
+	}
+
+	public void setElement(EObject newElement) {
 		EObject oldElement = element;
 		element = newElement;
 		boolean oldElementESet = (eFlags & ELEMENT_ESETFLAG) != 0;
 		eFlags |= ELEMENT_ESETFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__ELEMENT, oldElement, element, !oldElementESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__ELEMENT, oldElement, element,
+					!oldElementESet));
 	}
 
 	public void unsetElement() {
@@ -188,248 +192,246 @@
 		element = null;
 		eFlags &= ~ELEMENT_ESETFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, NotationPackage.VIEW__ELEMENT, oldElement, null, oldElementESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, NotationPackage.VIEW__ELEMENT, oldElement, null,
+					oldElementESet));
 	}
 
 	public boolean isSetElement() {
 		return (eFlags & ELEMENT_ESETFLAG) != 0;
 	}
 
-    public Diagram getDiagram() {
+	public Diagram getDiagram() {
 		Diagram diagram = basicGetDiagram();
-		return diagram != null && diagram.eIsProxy() ? (Diagram)eResolveProxy((InternalEObject)diagram) : diagram;
+		return diagram != null && diagram.eIsProxy() ? (Diagram) eResolveProxy((InternalEObject) diagram) : diagram;
 	}
 
-    public Diagram basicGetDiagram() {
-        for (EObject parent = this; parent != null; parent = ((InternalEObject)parent)
-            .eInternalContainer())
-            if (NotationPackage.Literals.DIAGRAM.isSuperTypeOf(
-                parent.eClass()))
-                return (Diagram) parent;
-        return null;
-    }
-
-    public EList getTransientChildren() {
-        return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_TransientChildren(), 0, null);
+	public Diagram basicGetDiagram() {
+		for (EObject parent = this; parent != null; parent = ((InternalEObject) parent).eInternalContainer())
+			if (NotationPackage.Literals.DIAGRAM.isSuperTypeOf(parent.eClass()))
+				return (Diagram) parent;
+		return null;
 	}
 
-    public Style getStyle(EClass eClass) {
-    	if (eClass != null && NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {
-    		EClass thisEClass = eClass(); 
-    		if (eClass.isSuperTypeOf(thisEClass) || eClass == thisEClass) {
-    			return (Style) this;
-    		}
-            if (eIsSet(NotationPackage.Literals.VIEW__STYLES)) {
-                for (Iterator i = getStyles().iterator(); i.hasNext();) {
-                    Style style = (Style) i.next();
-                    if (style.eClass() == eClass || eClass.isInstance(style))
-                        return style;
-                }
-            }    		
-    	}
-        return null;
-    }
+	public EList getTransientChildren() {
+		return new EcoreEList.UnmodifiableEList(this, NotationPackage.eINSTANCE.getView_TransientChildren(), 0, null);
+	}
 
-    public Node createChild(EClass eClass) {
-        Node newChild = (Node) eClass.getEPackage().getEFactoryInstance()
-            .create(eClass);
-        getPersistedChildren().add(newChild);
-        return newChild;
-    }
+	public Style getStyle(EClass eClass) {
+		if (eClass != null && NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {
+			EClass thisEClass = eClass();
+			if (eClass.isSuperTypeOf(thisEClass) || eClass == thisEClass) {
+				return (Style) this;
+			}
+			if (eIsSet(NotationPackage.Literals.VIEW__STYLES)) {
+				for (Iterator i = getStyles().iterator(); i.hasNext();) {
+					Style style = (Style) i.next();
+					if (style.eClass() == eClass || eClass.isInstance(style))
+						return style;
+				}
+			}
+		}
+		return null;
+	}
 
-    public Style createStyle(EClass eClass) {
-        Style newStyle = (Style) eClass.getEPackage().getEFactoryInstance()
-            .create(eClass);
-        getStyles().add(newStyle);
-        return newStyle;
-    }
+	public Node createChild(EClass eClass) {
+		Node newChild = (Node) eClass.getEPackage().getEFactoryInstance().create(eClass);
+		getPersistedChildren().add(newChild);
+		return newChild;
+	}
+
+	public Style createStyle(EClass eClass) {
+		Style newStyle = (Style) eClass.getEPackage().getEFactoryInstance().create(eClass);
+		getStyles().add(newStyle);
+		return newStyle;
+	}
 
 	public NamedStyle getNamedStyle(EClass eClass, String name) {
-        if (eClass != null
-                && eIsSet(NotationPackage.Literals.VIEW__STYLES)
-                && NotationPackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
-                for (Iterator i = getStyles().iterator(); i.hasNext();) {
-                    Style style = (Style) i.next();
-                    if (style.eClass() == eClass || eClass.isInstance(style))
-                        if (style.eGet(NotationPackage.eINSTANCE.getNamedStyle_Name()).equals(name))
-                        	return (NamedStyle)style;
-                }
-            }
-            return null;
+		if (eClass != null && eIsSet(NotationPackage.Literals.VIEW__STYLES)
+				&& NotationPackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
+			for (Iterator i = getStyles().iterator(); i.hasNext();) {
+				Style style = (Style) i.next();
+				if (style.eClass() == eClass || eClass.isInstance(style))
+					if (style.eGet(NotationPackage.eINSTANCE.getNamedStyle_Name()).equals(name))
+						return (NamedStyle) style;
+			}
+		}
+		return null;
 	}
 
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
+		case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicAdd(otherEnd, msgs);
 		}
 		return eDynamicInverseAdd(otherEnd, featureID, msgs);
 	}
 
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
+		case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.BASIC_DECORATION_NODE__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.BASIC_DECORATION_NODE__TYPE:
-				return getType();
-			case NotationPackage.BASIC_DECORATION_NODE__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.BASIC_DECORATION_NODE__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.BASIC_DECORATION_NODE__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.BASIC_DECORATION_NODE__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.BASIC_DECORATION_NODE__STYLES:
-				return getStyles();
-			case NotationPackage.BASIC_DECORATION_NODE__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.BASIC_DECORATION_NODE__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.BASIC_DECORATION_NODE__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
+		case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.BASIC_DECORATION_NODE__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BASIC_DECORATION_NODE__TYPE:
+			return getType();
+		case NotationPackage.BASIC_DECORATION_NODE__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BASIC_DECORATION_NODE__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.BASIC_DECORATION_NODE__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.BASIC_DECORATION_NODE__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.BASIC_DECORATION_NODE__STYLES:
+			return getStyles();
+		case NotationPackage.BASIC_DECORATION_NODE__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.BASIC_DECORATION_NODE__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.BASIC_DECORATION_NODE__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__SOURCE_EDGES:
-			case NotationPackage.BASIC_DECORATION_NODE__TARGET_EDGES:
-			case NotationPackage.BASIC_DECORATION_NODE__PERSISTED_CHILDREN:
-			case NotationPackage.BASIC_DECORATION_NODE__STYLES:
-			case NotationPackage.BASIC_DECORATION_NODE__TRANSIENT_CHILDREN:
-			case NotationPackage.BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT:
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__ELEMENT:
-				setElement((EObject)newValue);
-				return;
+		case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__SOURCE_EDGES:
+		case NotationPackage.BASIC_DECORATION_NODE__TARGET_EDGES:
+		case NotationPackage.BASIC_DECORATION_NODE__PERSISTED_CHILDREN:
+		case NotationPackage.BASIC_DECORATION_NODE__STYLES:
+		case NotationPackage.BASIC_DECORATION_NODE__TRANSIENT_CHILDREN:
+		case NotationPackage.BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT:
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__ELEMENT:
+			setElement((EObject) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__SOURCE_EDGES:
-			case NotationPackage.BASIC_DECORATION_NODE__TARGET_EDGES:
-			case NotationPackage.BASIC_DECORATION_NODE__PERSISTED_CHILDREN:
-			case NotationPackage.BASIC_DECORATION_NODE__STYLES:
-			case NotationPackage.BASIC_DECORATION_NODE__TRANSIENT_CHILDREN:
-			case NotationPackage.BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT:
-				return;
-			case NotationPackage.BASIC_DECORATION_NODE__ELEMENT:
-				unsetElement();
-				return;
+		case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__SOURCE_EDGES:
+		case NotationPackage.BASIC_DECORATION_NODE__TARGET_EDGES:
+		case NotationPackage.BASIC_DECORATION_NODE__PERSISTED_CHILDREN:
+		case NotationPackage.BASIC_DECORATION_NODE__STYLES:
+		case NotationPackage.BASIC_DECORATION_NODE__TRANSIENT_CHILDREN:
+		case NotationPackage.BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT:
+			return;
+		case NotationPackage.BASIC_DECORATION_NODE__ELEMENT:
+			unsetElement();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.BASIC_DECORATION_NODE__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.BASIC_DECORATION_NODE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.BASIC_DECORATION_NODE__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.BASIC_DECORATION_NODE__SOURCE_EDGES:
-			case NotationPackage.BASIC_DECORATION_NODE__TARGET_EDGES:
-			case NotationPackage.BASIC_DECORATION_NODE__PERSISTED_CHILDREN:
-			case NotationPackage.BASIC_DECORATION_NODE__STYLES:
-			case NotationPackage.BASIC_DECORATION_NODE__TRANSIENT_CHILDREN:
-			case NotationPackage.BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT:
-				return false;
-			case NotationPackage.BASIC_DECORATION_NODE__ELEMENT:
-				return isSetElement();
-			case NotationPackage.BASIC_DECORATION_NODE__DIAGRAM:
-				return basicGetDiagram() != null;
+		case NotationPackage.BASIC_DECORATION_NODE__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.BASIC_DECORATION_NODE__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.BASIC_DECORATION_NODE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.BASIC_DECORATION_NODE__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.BASIC_DECORATION_NODE__SOURCE_EDGES:
+		case NotationPackage.BASIC_DECORATION_NODE__TARGET_EDGES:
+		case NotationPackage.BASIC_DECORATION_NODE__PERSISTED_CHILDREN:
+		case NotationPackage.BASIC_DECORATION_NODE__STYLES:
+		case NotationPackage.BASIC_DECORATION_NODE__TRANSIENT_CHILDREN:
+		case NotationPackage.BASIC_DECORATION_NODE__LAYOUT_CONSTRAINT:
+			return false;
+		case NotationPackage.BASIC_DECORATION_NODE__ELEMENT:
+			return isSetElement();
+		case NotationPackage.BASIC_DECORATION_NODE__DIAGRAM:
+			return basicGetDiagram() != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void persistChildren() {
-        if (eIsSet(NotationPackage.eINSTANCE.getView_TransientChildren())) {
-            getPersistedChildren().addAll(getTransientChildren());
-        }
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void persistChildren() {
+		if (eIsSet(NotationPackage.eINSTANCE.getView_TransientChildren())) {
+			getPersistedChildren().addAll(getTransientChildren());
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertChild(View child) {
-        persistChildren();
-        getPersistedChildren().add(child);
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertChild(View child) {
+		persistChildren();
+		getPersistedChildren().add(child);
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertChildAt(View child, int index) {
-        persistChildren();
-        if (getPersistedChildren().size() >= index) {
-            getPersistedChildren().add(index, child);
-        }
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertChildAt(View child, int index) {
+		persistChildren();
+		if (getPersistedChildren().size() >= index) {
+			getPersistedChildren().add(index, child);
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertChild(View child, boolean persisted) {
-        List children = null;
-        if (persisted)
-            children = getPersistedChildren();
-        else
-            children = getTransientChildren();
-        children.add(child);
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertChild(View child, boolean persisted) {
+		List children = null;
+		if (persisted)
+			children = getPersistedChildren();
+		else
+			children = getTransientChildren();
+		children.add(child);
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
 	public void removeChild(View child) {
 		if (child.eContainingFeature() == NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN) {
 			if (eIsSet(NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN)) {
@@ -442,58 +444,59 @@
 		}
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void persist() {
-        EStructuralFeature eContaingFeature = eContainingFeature();
-        if (eContainer() != null && eContaingFeature != null
-            && eContainer() instanceof View && eContaingFeature.isTransient()) {
-            View vContainer = (View) eContainer();
-            vContainer.persistChildren();
-        }
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void persist() {
+		EStructuralFeature eContaingFeature = eContainingFeature();
+		if (eContainer() != null && eContaingFeature != null && eContainer() instanceof View
+				&& eContaingFeature.isTransient()) {
+			View vContainer = (View) eContainer();
+			vContainer.persistChildren();
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public EList getVisibleChildren() {
-    	boolean hasPersistedChildren = eIsSet(NotationPackage.Literals.VIEW__PERSISTED_CHILDREN);
-    	boolean hasTransientChildren = eIsSet(NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN); 
-        if (!hasPersistedChildren && !hasTransientChildren) {
-            return ECollections.EMPTY_ELIST;
-        }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public EList getVisibleChildren() {
+		boolean hasPersistedChildren = eIsSet(NotationPackage.Literals.VIEW__PERSISTED_CHILDREN);
+		boolean hasTransientChildren = eIsSet(NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN);
+		if (!hasPersistedChildren && !hasTransientChildren) {
+			return ECollections.EMPTY_ELIST;
+		}
 
-        List _children = new ArrayList();
-        
-        if (hasPersistedChildren) {
-        	for (Iterator it = getPersistedChildren().iterator(); it.hasNext();) {
+		List _children = new ArrayList();
+
+		if (hasPersistedChildren) {
+			for (Iterator it = getPersistedChildren().iterator(); it.hasNext();) {
 				Node node = (Node) it.next();
 				if (node.isVisible())
-                    _children.add(node);
+					_children.add(node);
 			}
-        }
+		}
 
-        if (hasTransientChildren) {
-        	for (Iterator it = getTransientChildren().iterator(); it.hasNext();) {
+		if (hasTransientChildren) {
+			for (Iterator it = getTransientChildren().iterator(); it.hasNext();) {
 				Node node = (Node) it.next();
 				if (node.isVisible())
-                    _children.add(node);
+					_children.add(node);
 			}
-        }       
-        
-        return new BasicEList.UnmodifiableEList(_children.size(), _children
-            .toArray());
-    }
+		}
+
+		return new BasicEList.UnmodifiableEList(_children.size(), _children.toArray());
+	}
 
 	public LayoutConstraint createLayoutConstraint(EClass eClass) {
-		LayoutConstraint newLayoutConstraint = (LayoutConstraint) eClass.getEPackage().getEFactoryInstance().create(eClass);
+		LayoutConstraint newLayoutConstraint = (LayoutConstraint) eClass.getEPackage().getEFactoryInstance()
+				.create(eClass);
 		setLayoutConstraint(newLayoutConstraint);
 		return newLayoutConstraint;
 	}
-	
+
 	public void setLayoutConstraint(LayoutConstraint newLayoutConstraint) {
-    	throw new UnsupportedOperationException("BasicDecorationNodeImpl#setLayoutConstraint(LayoutConstraint newLayoutConstraint)"); //$NON-NLS-1$
+		throw new UnsupportedOperationException(
+				"BasicDecorationNodeImpl#setLayoutConstraint(LayoutConstraint newLayoutConstraint)"); //$NON-NLS-1$
 	}
 
 	public NotificationChain basicSetLayoutConstraint(LayoutConstraint newLayoutConstraint, NotificationChain msgs) {
@@ -504,4 +507,4 @@
 		return null;
 	}
 
-} //BasicDecorationNodeImpl
+} // BasicDecorationNodeImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicSemanticCompartmentImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicSemanticCompartmentImpl.java
index 4dfd66d..6de0519 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicSemanticCompartmentImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BasicSemanticCompartmentImpl.java
@@ -15,14 +15,11 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment;
 import org.eclipse.gmf.runtime.notation.DrawerStyle;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;
@@ -30,15 +27,15 @@
 import org.eclipse.gmf.runtime.notation.Style;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Basic Semantic Compartment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Basic
+ * Semantic Compartment</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl#isCollapsed <em>Collapsed</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl#isCollapsed
+ * <em>Collapsed</em>}</li>
+ * </ul>
  *
  * @generated
  * @since 1.2
@@ -48,9 +45,9 @@
 	protected LayoutConstraint layoutConstraint;
 
 	/**
-	 * The default value of the '{@link #isCollapsed() <em>Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isCollapsed() <em>Collapsed</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCollapsed()
 	 * @generated
 	 * @ordered
@@ -58,9 +55,9 @@
 	protected static final boolean COLLAPSED_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isCollapsed() <em>Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isCollapsed()
+	 * <em>Collapsed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCollapsed()
 	 * @generated
 	 * @ordered
@@ -68,8 +65,8 @@
 	protected static final int COLLAPSED_EFLAG = 1 << 11;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BasicSemanticCompartmentImpl() {
@@ -77,8 +74,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -86,8 +83,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isCollapsed() {
@@ -95,195 +92,201 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCollapsed(boolean newCollapsed) {
 		boolean oldCollapsed = (eFlags & COLLAPSED_EFLAG) != 0;
-		if (newCollapsed) eFlags |= COLLAPSED_EFLAG; else eFlags &= ~COLLAPSED_EFLAG;
+		if (newCollapsed)
+			eFlags |= COLLAPSED_EFLAG;
+		else
+			eFlags &= ~COLLAPSED_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED, oldCollapsed, newCollapsed));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED,
+					oldCollapsed, newCollapsed));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TYPE:
-				return getType();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
-				return getStyles();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
-				return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TYPE:
+			return getType();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
+			return getStyles();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
+			return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				return;
-			default:
-				eSetGen(featureID, newValue);
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			return;
+		default:
+			eSetGen(featureID, newValue);
 		}
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSetGen(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)newValue);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
-				setCollapsed(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) newValue);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
+			setCollapsed(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				return;
-			default:
-				eUnsetGen(featureID);
-			}		
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			return;
+		default:
+			eUnsetGen(featureID);
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnsetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)null);
-				return;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
-				setCollapsed(COLLAPSED_EDEFAULT);
-				return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) null);
+			return;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
+			setCollapsed(COLLAPSED_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean eIsSet(int featureID) {
@@ -296,89 +299,96 @@
 			return false;
 		default:
 			return eIsSetGen(featureID);
-		}		
+		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT_CDO
 	 */
 	public boolean eIsSetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
-				return false;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__ELEMENT:
-				return isSetElement();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return layoutConstraint != null;
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
-				return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TARGET_EDGES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__PERSISTED_CHILDREN:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__STYLES:
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__TRANSIENT_CHILDREN:
+			return false;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__ELEMENT:
+			return isSetElement();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return layoutConstraint != null;
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
+			return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DrawerStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED: return NotationPackage.DRAWER_STYLE__COLLAPSED;
-				default: return -1;
+			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED:
+				return NotationPackage.DRAWER_STYLE__COLLAPSED;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DrawerStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.DRAWER_STYLE__COLLAPSED: return NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED;
-				default: return -1;
+			case NotationPackage.DRAWER_STYLE__COLLAPSED:
+				return NotationPackage.BASIC_SEMANTIC_COMPARTMENT__COLLAPSED;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (collapsed: "); //$NON-NLS-1$
@@ -387,42 +397,50 @@
 		return result.toString();
 	}
 
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return basicSetLayoutConstraint(null, msgs);
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return basicSetLayoutConstraint(null, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	public LayoutConstraint createLayoutConstraint(EClass eClass) {
-		LayoutConstraint newLayoutConstraint = (LayoutConstraint) eClass.getEPackage().getEFactoryInstance().create(eClass);
+		LayoutConstraint newLayoutConstraint = (LayoutConstraint) eClass.getEPackage().getEFactoryInstance()
+				.create(eClass);
 		setLayoutConstraint(newLayoutConstraint);
 		return newLayoutConstraint;
 	}
-	
+
 	public void setLayoutConstraint(LayoutConstraint newLayoutConstraint) {
 		if (newLayoutConstraint != layoutConstraint) {
 			NotificationChain msgs = null;
 			if (layoutConstraint != null)
-				msgs = ((InternalEObject)layoutConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
+				msgs = ((InternalEObject) layoutConstraint).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
 			if (newLayoutConstraint != null)
-				msgs = ((InternalEObject)newLayoutConstraint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
+				msgs = ((InternalEObject) newLayoutConstraint).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
 			msgs = basicSetLayoutConstraint(newLayoutConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.NODE__LAYOUT_CONSTRAINT, newLayoutConstraint, newLayoutConstraint));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.NODE__LAYOUT_CONSTRAINT,
+					newLayoutConstraint, newLayoutConstraint));
 	}
 
 	public NotificationChain basicSetLayoutConstraint(LayoutConstraint newLayoutConstraint, NotificationChain msgs) {
 		LayoutConstraint oldLayoutConstraint = layoutConstraint;
 		layoutConstraint = newLayoutConstraint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.NODE__LAYOUT_CONSTRAINT, oldLayoutConstraint, newLayoutConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.NODE__LAYOUT_CONSTRAINT, oldLayoutConstraint, newLayoutConstraint);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -431,4 +449,4 @@
 		return layoutConstraint;
 	}
 
-} //BasicSemanticCompartmentImpl
+} // BasicSemanticCompartmentImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BooleanListValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BooleanListValueStyleImpl.java
index 99129a4..e896b29 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BooleanListValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BooleanListValueStyleImpl.java
@@ -20,31 +20,32 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Boolean
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl#getBooleanListValue <em>Boolean List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl#getBooleanListValue
+ * <em>Boolean List Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class BooleanListValueStyleImpl extends NamedStyleImpl implements BooleanListValueStyle {
 	/**
-	 * The cached value of the '{@link #getBooleanListValue() <em>Boolean List Value</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBooleanListValue() <em>Boolean List
+	 * Value</em>}' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBooleanListValue()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList booleanListValue;
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BooleanListValueStyleImpl() {
@@ -52,8 +53,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -61,89 +62,91 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getBooleanListValue() {
 		if (booleanListValue == null) {
-			booleanListValue = new EDataTypeEList(Boolean.class, this, NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);
+			booleanListValue = new EDataTypeEList(Boolean.class, this,
+					NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);
 		}
 		return booleanListValue;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
-				return getBooleanListValue();
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+			return getBooleanListValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
-				getBooleanListValue().clear();
-				getBooleanListValue().addAll((Collection)newValue);
-				return;
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+			getBooleanListValue().clear();
+			getBooleanListValue().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
-				getBooleanListValue().clear();
-				return;
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+			getBooleanListValue().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
-				return booleanListValue != null && !booleanListValue.isEmpty();
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+			return booleanListValue != null && !booleanListValue.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (booleanListValue: "); //$NON-NLS-1$
@@ -152,4 +155,4 @@
 		return result.toString();
 	}
 
-} //BooleanListValueStyleImpl
+} // BooleanListValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BooleanValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BooleanValueStyleImpl.java
index de70e31..e4eb980 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BooleanValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BooleanValueStyleImpl.java
@@ -12,39 +12,37 @@
 package org.eclipse.gmf.runtime.notation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.BooleanValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Boolean
+ * Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl#isBooleanValue <em>Boolean Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl#isBooleanValue
+ * <em>Boolean Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValueStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
+
 	/**
-	 * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isBooleanValue()
 	 * @generated
 	 * @ordered
@@ -52,9 +50,9 @@
 	protected static final boolean BOOLEAN_VALUE_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isBooleanValue() <em>Boolean
+	 * Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isBooleanValue()
 	 * @generated
 	 * @ordered
@@ -62,8 +60,8 @@
 	protected static final int BOOLEAN_VALUE_EFLAG = 1 << 8;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BooleanValueStyleImpl() {
@@ -71,8 +69,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -80,8 +78,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isBooleanValue() {
@@ -89,88 +87,93 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBooleanValue(boolean newBooleanValue) {
 		boolean oldBooleanValue = (eFlags & BOOLEAN_VALUE_EFLAG) != 0;
-		if (newBooleanValue) eFlags |= BOOLEAN_VALUE_EFLAG; else eFlags &= ~BOOLEAN_VALUE_EFLAG;
+		if (newBooleanValue)
+			eFlags |= BOOLEAN_VALUE_EFLAG;
+		else
+			eFlags &= ~BOOLEAN_VALUE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE, oldBooleanValue, newBooleanValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE,
+					oldBooleanValue, newBooleanValue));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.BOOLEAN_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
-				return isBooleanValue() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.BOOLEAN_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+			return isBooleanValue() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BOOLEAN_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
-				setBooleanValue(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.BOOLEAN_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+			setBooleanValue(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BOOLEAN_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
-				setBooleanValue(BOOLEAN_VALUE_EDEFAULT);
-				return;
+		case NotationPackage.BOOLEAN_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+			setBooleanValue(BOOLEAN_VALUE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BOOLEAN_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
-				return ((eFlags & BOOLEAN_VALUE_EFLAG) != 0) != BOOLEAN_VALUE_EDEFAULT;
+		case NotationPackage.BOOLEAN_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+			return ((eFlags & BOOLEAN_VALUE_EFLAG) != 0) != BOOLEAN_VALUE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (booleanValue: "); //$NON-NLS-1$
@@ -179,4 +182,4 @@
 		return result.toString();
 	}
 
-} //BooleanValueStyleImpl
+} // BooleanValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BoundsImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BoundsImpl.java
index 10a4ec9..1fc4eaf 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BoundsImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/BoundsImpl.java
@@ -20,16 +20,17 @@
 import org.eclipse.gmf.runtime.notation.Size;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bounds</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Bounds</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.BoundsImpl#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.BoundsImpl#getHeight <em>Height</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.BoundsImpl#getWidth
+ * <em>Width</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.BoundsImpl#getHeight
+ * <em>Height</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -37,76 +38,76 @@
  * @canBeSeenBy %partners
  */
 public class BoundsImpl extends LocationImpl implements Bounds {
-    /**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int WIDTH_EDEFAULT = -1;
 
-    /**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected int width = WIDTH_EDEFAULT;
 
-    /**
+	/**
 	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int HEIGHT_EDEFAULT = -1;
 
-    /**
+	/**
 	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected int height = HEIGHT_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BoundsImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.BOUNDS;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getWidth() {
 		return width;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(int newWidth) {
@@ -116,18 +117,18 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BOUNDS__WIDTH, oldWidth, width));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getHeight() {
 		return height;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHeight(int newHeight) {
@@ -137,129 +138,136 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BOUNDS__HEIGHT, oldHeight, height));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.BOUNDS__X:
-				return new Integer(getX());
-			case NotationPackage.BOUNDS__Y:
-				return new Integer(getY());
-			case NotationPackage.BOUNDS__WIDTH:
-				return new Integer(getWidth());
-			case NotationPackage.BOUNDS__HEIGHT:
-				return new Integer(getHeight());
+		case NotationPackage.BOUNDS__X:
+			return new Integer(getX());
+		case NotationPackage.BOUNDS__Y:
+			return new Integer(getY());
+		case NotationPackage.BOUNDS__WIDTH:
+			return new Integer(getWidth());
+		case NotationPackage.BOUNDS__HEIGHT:
+			return new Integer(getHeight());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BOUNDS__X:
-				setX(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.BOUNDS__Y:
-				setY(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.BOUNDS__WIDTH:
-				setWidth(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.BOUNDS__HEIGHT:
-				setHeight(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.BOUNDS__X:
+			setX(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.BOUNDS__Y:
+			setY(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.BOUNDS__WIDTH:
+			setWidth(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.BOUNDS__HEIGHT:
+			setHeight(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BOUNDS__X:
-				setX(X_EDEFAULT);
-				return;
-			case NotationPackage.BOUNDS__Y:
-				setY(Y_EDEFAULT);
-				return;
-			case NotationPackage.BOUNDS__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
-			case NotationPackage.BOUNDS__HEIGHT:
-				setHeight(HEIGHT_EDEFAULT);
-				return;
+		case NotationPackage.BOUNDS__X:
+			setX(X_EDEFAULT);
+			return;
+		case NotationPackage.BOUNDS__Y:
+			setY(Y_EDEFAULT);
+			return;
+		case NotationPackage.BOUNDS__WIDTH:
+			setWidth(WIDTH_EDEFAULT);
+			return;
+		case NotationPackage.BOUNDS__HEIGHT:
+			setHeight(HEIGHT_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BOUNDS__X:
-				return x != X_EDEFAULT;
-			case NotationPackage.BOUNDS__Y:
-				return y != Y_EDEFAULT;
-			case NotationPackage.BOUNDS__WIDTH:
-				return width != WIDTH_EDEFAULT;
-			case NotationPackage.BOUNDS__HEIGHT:
-				return height != HEIGHT_EDEFAULT;
+		case NotationPackage.BOUNDS__X:
+			return x != X_EDEFAULT;
+		case NotationPackage.BOUNDS__Y:
+			return y != Y_EDEFAULT;
+		case NotationPackage.BOUNDS__WIDTH:
+			return width != WIDTH_EDEFAULT;
+		case NotationPackage.BOUNDS__HEIGHT:
+			return height != HEIGHT_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == Size.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.BOUNDS__WIDTH: return NotationPackage.SIZE__WIDTH;
-				case NotationPackage.BOUNDS__HEIGHT: return NotationPackage.SIZE__HEIGHT;
-				default: return -1;
+			case NotationPackage.BOUNDS__WIDTH:
+				return NotationPackage.SIZE__WIDTH;
+			case NotationPackage.BOUNDS__HEIGHT:
+				return NotationPackage.SIZE__HEIGHT;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == Size.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.SIZE__WIDTH: return NotationPackage.BOUNDS__WIDTH;
-				case NotationPackage.SIZE__HEIGHT: return NotationPackage.BOUNDS__HEIGHT;
-				default: return -1;
+			case NotationPackage.SIZE__WIDTH:
+				return NotationPackage.BOUNDS__WIDTH;
+			case NotationPackage.SIZE__HEIGHT:
+				return NotationPackage.BOUNDS__HEIGHT;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (width: "); //$NON-NLS-1$
@@ -270,4 +278,4 @@
 		return result.toString();
 	}
 
-} //BoundsImpl
+} // BoundsImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ByteArrayValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ByteArrayValueStyleImpl.java
index 3f7458a..357a80e 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ByteArrayValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ByteArrayValueStyleImpl.java
@@ -12,32 +12,29 @@
 package org.eclipse.gmf.runtime.notation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.ByteArrayValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Byte Array Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Byte
+ * Array Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl#getByteArrayValue <em>Byte Array Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl#getByteArrayValue
+ * <em>Byte Array Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class ByteArrayValueStyleImpl extends NamedStyleImpl implements ByteArrayValueStyle {
 	/**
-	 * The default value of the '{@link #getByteArrayValue() <em>Byte Array Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getByteArrayValue() <em>Byte Array
+	 * Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getByteArrayValue()
 	 * @generated
 	 * @ordered
@@ -45,9 +42,9 @@
 	protected static final byte[] BYTE_ARRAY_VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getByteArrayValue() <em>Byte Array Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getByteArrayValue() <em>Byte Array
+	 * Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getByteArrayValue()
 	 * @generated
 	 * @ordered
@@ -55,8 +52,8 @@
 	protected byte[] byteArrayValue = BYTE_ARRAY_VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ByteArrayValueStyleImpl() {
@@ -64,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -73,8 +70,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public byte[] getByteArrayValue() {
@@ -82,88 +79,91 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setByteArrayValue(byte[] newByteArrayValue) {
 		byte[] oldByteArrayValue = byteArrayValue;
 		byteArrayValue = newByteArrayValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE, oldByteArrayValue, byteArrayValue));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE, oldByteArrayValue, byteArrayValue));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE:
-				return getByteArrayValue();
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE:
+			return getByteArrayValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE:
-				setByteArrayValue((byte[])newValue);
-				return;
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE:
+			setByteArrayValue((byte[]) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE:
-				setByteArrayValue(BYTE_ARRAY_VALUE_EDEFAULT);
-				return;
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE:
+			setByteArrayValue(BYTE_ARRAY_VALUE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE:
-				return BYTE_ARRAY_VALUE_EDEFAULT == null ? byteArrayValue != null : !BYTE_ARRAY_VALUE_EDEFAULT.equals(byteArrayValue);
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE__BYTE_ARRAY_VALUE:
+			return BYTE_ARRAY_VALUE_EDEFAULT == null ? byteArrayValue != null
+					: !BYTE_ARRAY_VALUE_EDEFAULT.equals(byteArrayValue);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (byteArrayValue: "); //$NON-NLS-1$
@@ -172,4 +172,4 @@
 		return result.toString();
 	}
 
-} //ByteArrayValueStyleImpl
+} // ByteArrayValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/CanonicalStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/CanonicalStyleImpl.java
index be466da..27f1ef6 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/CanonicalStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/CanonicalStyleImpl.java
@@ -20,15 +20,15 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Canonical Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Canonical Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl#isCanonical <em>Canonical</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl#isCanonical
+ * <em>Canonical</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -36,36 +36,37 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class CanonicalStyleImpl extends MinimalEObjectImpl.Container implements CanonicalStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
-    /**
-	 * The default value of the '{@link #isCanonical() <em>Canonical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * The default value of the '{@link #isCanonical() <em>Canonical</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCanonical()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean CANONICAL_EDEFAULT = true;
 
-    /**
-	 * The flag representing the value of the '{@link #isCanonical() <em>Canonical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isCanonical()
+	 * <em>Canonical</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCanonical()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int CANONICAL_EFLAG = 1 << 8;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CanonicalStyleImpl() {
@@ -73,97 +74,102 @@
 		eFlags |= CANONICAL_EFLAG;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.CANONICAL_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isCanonical() {
 		return (eFlags & CANONICAL_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCanonical(boolean newCanonical) {
 		boolean oldCanonical = (eFlags & CANONICAL_EFLAG) != 0;
-		if (newCanonical) eFlags |= CANONICAL_EFLAG; else eFlags &= ~CANONICAL_EFLAG;
+		if (newCanonical)
+			eFlags |= CANONICAL_EFLAG;
+		else
+			eFlags &= ~CANONICAL_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CANONICAL_STYLE__CANONICAL, oldCanonical, newCanonical));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CANONICAL_STYLE__CANONICAL,
+					oldCanonical, newCanonical));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.CANONICAL_STYLE__CANONICAL:
-				return isCanonical() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CANONICAL_STYLE__CANONICAL:
+			return isCanonical() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.CANONICAL_STYLE__CANONICAL:
-				setCanonical(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.CANONICAL_STYLE__CANONICAL:
+			setCanonical(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.CANONICAL_STYLE__CANONICAL:
-				setCanonical(CANONICAL_EDEFAULT);
-				return;
+		case NotationPackage.CANONICAL_STYLE__CANONICAL:
+			setCanonical(CANONICAL_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.CANONICAL_STYLE__CANONICAL:
-				return ((eFlags & CANONICAL_EFLAG) != 0) != CANONICAL_EDEFAULT;
+		case NotationPackage.CANONICAL_STYLE__CANONICAL:
+			return ((eFlags & CANONICAL_EFLAG) != 0) != CANONICAL_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (canonical: "); //$NON-NLS-1$
@@ -172,4 +178,4 @@
 		return result.toString();
 	}
 
-} //CanonicalStyleImpl
+} // CanonicalStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/CompartmentImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/CompartmentImpl.java
index 27ccab5..98ac155 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/CompartmentImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/CompartmentImpl.java
@@ -24,25 +24,26 @@
 import org.eclipse.gmf.runtime.notation.TitleStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Compartment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Compartment</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.CompartmentImpl#isCanonical <em>Canonical</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.CompartmentImpl#isShowTitle <em>Show Title</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.CompartmentImpl#isCanonical
+ * <em>Canonical</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.CompartmentImpl#isShowTitle
+ * <em>Show Title</em>}</li>
+ * </ul>
  *
  * @generated
  * @since 1.2
  */
 public class CompartmentImpl extends BasicCompartmentImpl implements Compartment {
 	/**
-	 * The default value of the '{@link #isCanonical() <em>Canonical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isCanonical() <em>Canonical</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCanonical()
 	 * @generated
 	 * @ordered
@@ -50,9 +51,9 @@
 	protected static final boolean CANONICAL_EDEFAULT = true;
 
 	/**
-	 * The flag representing the value of the '{@link #isCanonical() <em>Canonical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isCanonical()
+	 * <em>Canonical</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCanonical()
 	 * @generated
 	 * @ordered
@@ -60,9 +61,9 @@
 	protected static final int CANONICAL_EFLAG = 1 << 12;
 
 	/**
-	 * The default value of the '{@link #isShowTitle() <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isShowTitle() <em>Show Title</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isShowTitle()
 	 * @generated
 	 * @ordered
@@ -70,9 +71,9 @@
 	protected static final boolean SHOW_TITLE_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isShowTitle() <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isShowTitle() <em>Show
+	 * Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isShowTitle()
 	 * @generated
 	 * @ordered
@@ -80,8 +81,8 @@
 	protected static final int SHOW_TITLE_EFLAG = 1 << 13;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CompartmentImpl() {
@@ -90,8 +91,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -99,8 +100,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isCanonical() {
@@ -108,20 +109,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCanonical(boolean newCanonical) {
 		boolean oldCanonical = (eFlags & CANONICAL_EFLAG) != 0;
-		if (newCanonical) eFlags |= CANONICAL_EFLAG; else eFlags &= ~CANONICAL_EFLAG;
+		if (newCanonical)
+			eFlags |= CANONICAL_EFLAG;
+		else
+			eFlags &= ~CANONICAL_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.COMPARTMENT__CANONICAL, oldCanonical, newCanonical));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.COMPARTMENT__CANONICAL, oldCanonical,
+					newCanonical));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isShowTitle() {
@@ -129,307 +134,321 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setShowTitle(boolean newShowTitle) {
 		boolean oldShowTitle = (eFlags & SHOW_TITLE_EFLAG) != 0;
-		if (newShowTitle) eFlags |= SHOW_TITLE_EFLAG; else eFlags &= ~SHOW_TITLE_EFLAG;
+		if (newShowTitle)
+			eFlags |= SHOW_TITLE_EFLAG;
+		else
+			eFlags &= ~SHOW_TITLE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.COMPARTMENT__SHOW_TITLE, oldShowTitle, newShowTitle));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.COMPARTMENT__SHOW_TITLE, oldShowTitle,
+					newShowTitle));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.COMPARTMENT__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.COMPARTMENT__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.COMPARTMENT__TYPE:
-				return getType();
-			case NotationPackage.COMPARTMENT__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.COMPARTMENT__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.COMPARTMENT__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.COMPARTMENT__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.COMPARTMENT__STYLES:
-				return getStyles();
-			case NotationPackage.COMPARTMENT__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.COMPARTMENT__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
-			case NotationPackage.COMPARTMENT__COLLAPSED:
-				return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.COMPARTMENT__CANONICAL:
-				return isCanonical() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.COMPARTMENT__SHOW_TITLE:
-				return isShowTitle() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.COMPARTMENT__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.COMPARTMENT__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.COMPARTMENT__TYPE:
+			return getType();
+		case NotationPackage.COMPARTMENT__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.COMPARTMENT__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.COMPARTMENT__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.COMPARTMENT__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.COMPARTMENT__STYLES:
+			return getStyles();
+		case NotationPackage.COMPARTMENT__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.COMPARTMENT__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
+		case NotationPackage.COMPARTMENT__COLLAPSED:
+			return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.COMPARTMENT__CANONICAL:
+			return isCanonical() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.COMPARTMENT__SHOW_TITLE:
+			return isShowTitle() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.COMPARTMENT__TARGET_EDGES:
-				return;
-			default:
-				eSetGen(featureID, newValue);
+		case NotationPackage.COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.COMPARTMENT__TARGET_EDGES:
+			return;
+		default:
+			eSetGen(featureID, newValue);
 		}
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSetGen(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.COMPARTMENT__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)newValue);
-				return;
-			case NotationPackage.COMPARTMENT__COLLAPSED:
-				setCollapsed(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.COMPARTMENT__CANONICAL:
-				setCanonical(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.COMPARTMENT__SHOW_TITLE:
-				setShowTitle(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.COMPARTMENT__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) newValue);
+			return;
+		case NotationPackage.COMPARTMENT__COLLAPSED:
+			setCollapsed(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.COMPARTMENT__CANONICAL:
+			setCanonical(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.COMPARTMENT__SHOW_TITLE:
+			setShowTitle(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.COMPARTMENT__TARGET_EDGES:
-				return;
-			default:
-				eUnsetGen(featureID);
+		case NotationPackage.COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.COMPARTMENT__TARGET_EDGES:
+			return;
+		default:
+			eUnsetGen(featureID);
 		}
 	}
 
-	
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnsetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.COMPARTMENT__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.COMPARTMENT__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.COMPARTMENT__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.COMPARTMENT__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.COMPARTMENT__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)null);
-				return;
-			case NotationPackage.COMPARTMENT__COLLAPSED:
-				setCollapsed(COLLAPSED_EDEFAULT);
-				return;
-			case NotationPackage.COMPARTMENT__CANONICAL:
-				setCanonical(CANONICAL_EDEFAULT);
-				return;
-			case NotationPackage.COMPARTMENT__SHOW_TITLE:
-				setShowTitle(SHOW_TITLE_EDEFAULT);
-				return;
+		case NotationPackage.COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.COMPARTMENT__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.COMPARTMENT__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.COMPARTMENT__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.COMPARTMENT__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.COMPARTMENT__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) null);
+			return;
+		case NotationPackage.COMPARTMENT__COLLAPSED:
+			setCollapsed(COLLAPSED_EDEFAULT);
+			return;
+		case NotationPackage.COMPARTMENT__CANONICAL:
+			setCanonical(CANONICAL_EDEFAULT);
+			return;
+		case NotationPackage.COMPARTMENT__SHOW_TITLE:
+			setShowTitle(SHOW_TITLE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.COMPARTMENT__TARGET_EDGES:
-				return false;
-			default:
-				return eIsSetGen(featureID);
+		case NotationPackage.COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.COMPARTMENT__TARGET_EDGES:
+			return false;
+		default:
+			return eIsSetGen(featureID);
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT_CDO
 	 */
 	public boolean eIsSetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.COMPARTMENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.COMPARTMENT__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.COMPARTMENT__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.COMPARTMENT__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.COMPARTMENT__TARGET_EDGES:
-				return false;
-			case NotationPackage.COMPARTMENT__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.COMPARTMENT__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.COMPARTMENT__ELEMENT:
-				return isSetElement();
-			case NotationPackage.COMPARTMENT__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT:
-				return layoutConstraint != null;
-			case NotationPackage.COMPARTMENT__COLLAPSED:
-				return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
-			case NotationPackage.COMPARTMENT__CANONICAL:
-				return ((eFlags & CANONICAL_EFLAG) != 0) != CANONICAL_EDEFAULT;
-			case NotationPackage.COMPARTMENT__SHOW_TITLE:
-				return ((eFlags & SHOW_TITLE_EFLAG) != 0) != SHOW_TITLE_EDEFAULT;
+		case NotationPackage.COMPARTMENT__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.COMPARTMENT__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.COMPARTMENT__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.COMPARTMENT__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.COMPARTMENT__TARGET_EDGES:
+			return false;
+		case NotationPackage.COMPARTMENT__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.COMPARTMENT__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.COMPARTMENT__ELEMENT:
+			return isSetElement();
+		case NotationPackage.COMPARTMENT__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.COMPARTMENT__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.COMPARTMENT__LAYOUT_CONSTRAINT:
+			return layoutConstraint != null;
+		case NotationPackage.COMPARTMENT__COLLAPSED:
+			return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
+		case NotationPackage.COMPARTMENT__CANONICAL:
+			return ((eFlags & CANONICAL_EFLAG) != 0) != CANONICAL_EDEFAULT;
+		case NotationPackage.COMPARTMENT__SHOW_TITLE:
+			return ((eFlags & SHOW_TITLE_EFLAG) != 0) != SHOW_TITLE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == CanonicalStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.COMPARTMENT__CANONICAL: return NotationPackage.CANONICAL_STYLE__CANONICAL;
-				default: return -1;
+			case NotationPackage.COMPARTMENT__CANONICAL:
+				return NotationPackage.CANONICAL_STYLE__CANONICAL;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == TitleStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.COMPARTMENT__SHOW_TITLE: return NotationPackage.TITLE_STYLE__SHOW_TITLE;
-				default: return -1;
+			case NotationPackage.COMPARTMENT__SHOW_TITLE:
+				return NotationPackage.TITLE_STYLE__SHOW_TITLE;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == CanonicalStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.CANONICAL_STYLE__CANONICAL: return NotationPackage.COMPARTMENT__CANONICAL;
-				default: return -1;
+			case NotationPackage.CANONICAL_STYLE__CANONICAL:
+				return NotationPackage.COMPARTMENT__CANONICAL;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == TitleStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.TITLE_STYLE__SHOW_TITLE: return NotationPackage.COMPARTMENT__SHOW_TITLE;
-				default: return -1;
+			case NotationPackage.TITLE_STYLE__SHOW_TITLE:
+				return NotationPackage.COMPARTMENT__SHOW_TITLE;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (canonical: "); //$NON-NLS-1$
@@ -440,4 +459,4 @@
 		return result.toString();
 	}
 
-} //CompartmentImpl
+} // CompartmentImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ConnectorImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ConnectorImpl.java
index aa63381..e2767a5 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ConnectorImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ConnectorImpl.java
@@ -14,12 +14,9 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.Anchor;
 import org.eclipse.gmf.runtime.notation.Bendpoints;
 import org.eclipse.gmf.runtime.notation.Connector;
@@ -36,32 +33,42 @@
 import org.eclipse.gmf.runtime.notation.View;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Connector</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Connector</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getRoundedBendpointsRadius <em>Rounded Bendpoints Radius</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getRouting <em>Routing</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getSmoothness <em>Smoothness</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#isAvoidObstructions <em>Avoid Obstructions</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#isClosestDistance <em>Closest Distance</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getJumpLinkStatus <em>Jump Link Status</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getJumpLinkType <em>Jump Link Type</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#isJumpLinksReverse <em>Jump Links Reverse</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getLineColor <em>Line Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getLineWidth <em>Line Width</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getRoundedBendpointsRadius
+ * <em>Rounded Bendpoints Radius</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getRouting
+ * <em>Routing</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getSmoothness
+ * <em>Smoothness</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#isAvoidObstructions
+ * <em>Avoid Obstructions</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#isClosestDistance
+ * <em>Closest Distance</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getJumpLinkStatus
+ * <em>Jump Link Status</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getJumpLinkType
+ * <em>Jump Link Type</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#isJumpLinksReverse
+ * <em>Jump Links Reverse</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getLineColor
+ * <em>Line Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorImpl#getLineWidth
+ * <em>Line Width</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class ConnectorImpl extends EdgeImpl implements Connector {
 	/**
-	 * The default value of the '{@link #getRoundedBendpointsRadius() <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRoundedBendpointsRadius() <em>Rounded
+	 * Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 * @ordered
@@ -69,9 +76,10 @@
 	protected static final int ROUNDED_BENDPOINTS_RADIUS_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getRoundedBendpointsRadius() <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRoundedBendpointsRadius() <em>Rounded
+	 * Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 * @ordered
@@ -80,8 +88,8 @@
 
 	/**
 	 * The default value of the '{@link #getRouting() <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRouting()
 	 * @generated
 	 * @ordered
@@ -89,36 +97,37 @@
 	protected static final Routing ROUTING_EDEFAULT = Routing.MANUAL_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getRouting() <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the '{@link #getRouting()
+	 * <em>Routing</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ROUTING_EFLAG_OFFSET = 11;
 
 	/**
-	 * The flags representing the default value of the '{@link #getRouting() <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getRouting()
+	 * <em>Routing</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ROUTING_EFLAG_DEFAULT = Routing.VALUES.indexOf(ROUTING_EDEFAULT) << ROUTING_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link Routing Routing}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link Routing Routing}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Routing[] ROUTING_EFLAG_VALUES = (Routing[])Routing.VALUES.toArray(new Routing[Routing.VALUES.size()]);
+	private static final Routing[] ROUTING_EFLAG_VALUES = (Routing[]) Routing.VALUES
+			.toArray(new Routing[Routing.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getRouting() <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getRouting()
+	 * <em>Routing</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRouting()
 	 * @generated
 	 * @ordered
@@ -126,9 +135,9 @@
 	protected static final int ROUTING_EFLAG = 0x3 << ROUTING_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #getSmoothness() <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSmoothness() <em>Smoothness</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSmoothness()
 	 * @generated
 	 * @ordered
@@ -136,36 +145,41 @@
 	protected static final Smoothness SMOOTHNESS_EDEFAULT = Smoothness.NONE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getSmoothness() <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the
+	 * '{@link #getSmoothness() <em>Smoothness</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SMOOTHNESS_EFLAG_OFFSET = 13;
 
 	/**
-	 * The flags representing the default value of the '{@link #getSmoothness() <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getSmoothness()
+	 * <em>Smoothness</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int SMOOTHNESS_EFLAG_DEFAULT = Smoothness.VALUES.indexOf(SMOOTHNESS_EDEFAULT) << SMOOTHNESS_EFLAG_OFFSET;
+	protected static final int SMOOTHNESS_EFLAG_DEFAULT = Smoothness.VALUES
+			.indexOf(SMOOTHNESS_EDEFAULT) << SMOOTHNESS_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link Smoothness Smoothness}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link Smoothness Smoothness}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Smoothness[] SMOOTHNESS_EFLAG_VALUES = (Smoothness[])Smoothness.VALUES.toArray(new Smoothness[Smoothness.VALUES.size()]);
+	private static final Smoothness[] SMOOTHNESS_EFLAG_VALUES = (Smoothness[]) Smoothness.VALUES
+			.toArray(new Smoothness[Smoothness.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getSmoothness() <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getSmoothness()
+	 * <em>Smoothness</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSmoothness()
 	 * @generated
 	 * @ordered
@@ -173,9 +187,9 @@
 	protected static final int SMOOTHNESS_EFLAG = 0x3 << SMOOTHNESS_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #isAvoidObstructions() <em>Avoid Obstructions</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isAvoidObstructions() <em>Avoid
+	 * Obstructions</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isAvoidObstructions()
 	 * @generated
 	 * @ordered
@@ -183,9 +197,10 @@
 	protected static final boolean AVOID_OBSTRUCTIONS_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isAvoidObstructions() <em>Avoid Obstructions</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isAvoidObstructions()
+	 * <em>Avoid Obstructions</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isAvoidObstructions()
 	 * @generated
 	 * @ordered
@@ -193,9 +208,9 @@
 	protected static final int AVOID_OBSTRUCTIONS_EFLAG = 1 << 15;
 
 	/**
-	 * The default value of the '{@link #isClosestDistance() <em>Closest Distance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isClosestDistance() <em>Closest
+	 * Distance</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isClosestDistance()
 	 * @generated
 	 * @ordered
@@ -203,9 +218,10 @@
 	protected static final boolean CLOSEST_DISTANCE_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isClosestDistance() <em>Closest Distance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isClosestDistance()
+	 * <em>Closest Distance</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isClosestDistance()
 	 * @generated
 	 * @ordered
@@ -213,9 +229,9 @@
 	protected static final int CLOSEST_DISTANCE_EFLAG = 1 << 16;
 
 	/**
-	 * The default value of the '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getJumpLinkStatus() <em>Jump Link
+	 * Status</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJumpLinkStatus()
 	 * @generated
 	 * @ordered
@@ -223,36 +239,40 @@
 	protected static final JumpLinkStatus JUMP_LINK_STATUS_EDEFAULT = JumpLinkStatus.NONE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the
+	 * '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int JUMP_LINK_STATUS_EFLAG_OFFSET = 17;
 
 	/**
-	 * The flags representing the default value of the '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getJumpLinkStatus()
+	 * <em>Jump Link Status</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int JUMP_LINK_STATUS_EFLAG_DEFAULT = JumpLinkStatus.VALUES.indexOf(JUMP_LINK_STATUS_EDEFAULT) << JUMP_LINK_STATUS_EFLAG_OFFSET;
+	protected static final int JUMP_LINK_STATUS_EFLAG_DEFAULT = JumpLinkStatus.VALUES
+			.indexOf(JUMP_LINK_STATUS_EDEFAULT) << JUMP_LINK_STATUS_EFLAG_OFFSET;
 
 	/**
 	 * The array of enumeration values for '{@link JumpLinkStatus Jump Link Status}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final JumpLinkStatus[] JUMP_LINK_STATUS_EFLAG_VALUES = (JumpLinkStatus[])JumpLinkStatus.VALUES.toArray(new JumpLinkStatus[JumpLinkStatus.VALUES.size()]);
+	private static final JumpLinkStatus[] JUMP_LINK_STATUS_EFLAG_VALUES = (JumpLinkStatus[]) JumpLinkStatus.VALUES
+			.toArray(new JumpLinkStatus[JumpLinkStatus.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getJumpLinkStatus() <em>Jump
+	 * Link Status</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJumpLinkStatus()
 	 * @generated
 	 * @ordered
@@ -260,9 +280,9 @@
 	protected static final int JUMP_LINK_STATUS_EFLAG = 0x3 << JUMP_LINK_STATUS_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJumpLinkType()
 	 * @generated
 	 * @ordered
@@ -270,36 +290,40 @@
 	protected static final JumpLinkType JUMP_LINK_TYPE_EDEFAULT = JumpLinkType.SEMICIRCLE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the
+	 * '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int JUMP_LINK_TYPE_EFLAG_OFFSET = 19;
 
 	/**
-	 * The flags representing the default value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getJumpLinkType()
+	 * <em>Jump Link Type</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int JUMP_LINK_TYPE_EFLAG_DEFAULT = JumpLinkType.VALUES.indexOf(JUMP_LINK_TYPE_EDEFAULT) << JUMP_LINK_TYPE_EFLAG_OFFSET;
+	protected static final int JUMP_LINK_TYPE_EFLAG_DEFAULT = JumpLinkType.VALUES
+			.indexOf(JUMP_LINK_TYPE_EDEFAULT) << JUMP_LINK_TYPE_EFLAG_OFFSET;
 
 	/**
 	 * The array of enumeration values for '{@link JumpLinkType Jump Link Type}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final JumpLinkType[] JUMP_LINK_TYPE_EFLAG_VALUES = (JumpLinkType[])JumpLinkType.VALUES.toArray(new JumpLinkType[JumpLinkType.VALUES.size()]);
+	private static final JumpLinkType[] JUMP_LINK_TYPE_EFLAG_VALUES = (JumpLinkType[]) JumpLinkType.VALUES
+			.toArray(new JumpLinkType[JumpLinkType.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getJumpLinkType() <em>Jump
+	 * Link Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJumpLinkType()
 	 * @generated
 	 * @ordered
@@ -307,9 +331,9 @@
 	protected static final int JUMP_LINK_TYPE_EFLAG = 0x3 << JUMP_LINK_TYPE_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #isJumpLinksReverse() <em>Jump Links Reverse</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isJumpLinksReverse() <em>Jump Links
+	 * Reverse</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isJumpLinksReverse()
 	 * @generated
 	 * @ordered
@@ -317,9 +341,9 @@
 	protected static final boolean JUMP_LINKS_REVERSE_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isJumpLinksReverse() <em>Jump Links Reverse</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isJumpLinksReverse() <em>Jump
+	 * Links Reverse</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isJumpLinksReverse()
 	 * @generated
 	 * @ordered
@@ -327,9 +351,9 @@
 	protected static final int JUMP_LINKS_REVERSE_EFLAG = 1 << 21;
 
 	/**
-	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
@@ -337,9 +361,9 @@
 	protected static final int LINE_COLOR_EDEFAULT = 11579568;
 
 	/**
-	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
@@ -347,9 +371,9 @@
 	protected int lineColor = LINE_COLOR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
@@ -357,9 +381,9 @@
 	protected static final int LINE_WIDTH_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
@@ -367,8 +391,8 @@
 	protected int lineWidth = LINE_WIDTH_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConnectorImpl() {
@@ -376,8 +400,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -385,8 +409,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Routing getRouting() {
@@ -394,21 +418,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRouting(Routing newRouting) {
 		Routing oldRouting = ROUTING_EFLAG_VALUES[(eFlags & ROUTING_EFLAG) >>> ROUTING_EFLAG_OFFSET];
-		if (newRouting == null) newRouting = ROUTING_EDEFAULT;
+		if (newRouting == null)
+			newRouting = ROUTING_EDEFAULT;
 		eFlags = eFlags & ~ROUTING_EFLAG | Routing.VALUES.indexOf(newRouting) << ROUTING_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__ROUTING, oldRouting, newRouting));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__ROUTING, oldRouting,
+					newRouting));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Smoothness getSmoothness() {
@@ -416,21 +442,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSmoothness(Smoothness newSmoothness) {
 		Smoothness oldSmoothness = SMOOTHNESS_EFLAG_VALUES[(eFlags & SMOOTHNESS_EFLAG) >>> SMOOTHNESS_EFLAG_OFFSET];
-		if (newSmoothness == null) newSmoothness = SMOOTHNESS_EDEFAULT;
+		if (newSmoothness == null)
+			newSmoothness = SMOOTHNESS_EDEFAULT;
 		eFlags = eFlags & ~SMOOTHNESS_EFLAG | Smoothness.VALUES.indexOf(newSmoothness) << SMOOTHNESS_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__SMOOTHNESS, oldSmoothness, newSmoothness));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__SMOOTHNESS, oldSmoothness,
+					newSmoothness));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isAvoidObstructions() {
@@ -438,20 +466,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAvoidObstructions(boolean newAvoidObstructions) {
 		boolean oldAvoidObstructions = (eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0;
-		if (newAvoidObstructions) eFlags |= AVOID_OBSTRUCTIONS_EFLAG; else eFlags &= ~AVOID_OBSTRUCTIONS_EFLAG;
+		if (newAvoidObstructions)
+			eFlags |= AVOID_OBSTRUCTIONS_EFLAG;
+		else
+			eFlags &= ~AVOID_OBSTRUCTIONS_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS, oldAvoidObstructions, newAvoidObstructions));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS,
+					oldAvoidObstructions, newAvoidObstructions));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isClosestDistance() {
@@ -459,20 +491,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClosestDistance(boolean newClosestDistance) {
 		boolean oldClosestDistance = (eFlags & CLOSEST_DISTANCE_EFLAG) != 0;
-		if (newClosestDistance) eFlags |= CLOSEST_DISTANCE_EFLAG; else eFlags &= ~CLOSEST_DISTANCE_EFLAG;
+		if (newClosestDistance)
+			eFlags |= CLOSEST_DISTANCE_EFLAG;
+		else
+			eFlags &= ~CLOSEST_DISTANCE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__CLOSEST_DISTANCE, oldClosestDistance, newClosestDistance));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__CLOSEST_DISTANCE,
+					oldClosestDistance, newClosestDistance));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public JumpLinkStatus getJumpLinkStatus() {
@@ -480,21 +516,25 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJumpLinkStatus(JumpLinkStatus newJumpLinkStatus) {
-		JumpLinkStatus oldJumpLinkStatus = JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags & JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET];
-		if (newJumpLinkStatus == null) newJumpLinkStatus = JUMP_LINK_STATUS_EDEFAULT;
-		eFlags = eFlags & ~JUMP_LINK_STATUS_EFLAG | JumpLinkStatus.VALUES.indexOf(newJumpLinkStatus) << JUMP_LINK_STATUS_EFLAG_OFFSET;
+		JumpLinkStatus oldJumpLinkStatus = JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags
+				& JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET];
+		if (newJumpLinkStatus == null)
+			newJumpLinkStatus = JUMP_LINK_STATUS_EDEFAULT;
+		eFlags = eFlags & ~JUMP_LINK_STATUS_EFLAG
+				| JumpLinkStatus.VALUES.indexOf(newJumpLinkStatus) << JUMP_LINK_STATUS_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__JUMP_LINK_STATUS, oldJumpLinkStatus, newJumpLinkStatus));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__JUMP_LINK_STATUS,
+					oldJumpLinkStatus, newJumpLinkStatus));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public JumpLinkType getJumpLinkType() {
@@ -502,21 +542,25 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJumpLinkType(JumpLinkType newJumpLinkType) {
-		JumpLinkType oldJumpLinkType = JUMP_LINK_TYPE_EFLAG_VALUES[(eFlags & JUMP_LINK_TYPE_EFLAG) >>> JUMP_LINK_TYPE_EFLAG_OFFSET];
-		if (newJumpLinkType == null) newJumpLinkType = JUMP_LINK_TYPE_EDEFAULT;
-		eFlags = eFlags & ~JUMP_LINK_TYPE_EFLAG | JumpLinkType.VALUES.indexOf(newJumpLinkType) << JUMP_LINK_TYPE_EFLAG_OFFSET;
+		JumpLinkType oldJumpLinkType = JUMP_LINK_TYPE_EFLAG_VALUES[(eFlags
+				& JUMP_LINK_TYPE_EFLAG) >>> JUMP_LINK_TYPE_EFLAG_OFFSET];
+		if (newJumpLinkType == null)
+			newJumpLinkType = JUMP_LINK_TYPE_EDEFAULT;
+		eFlags = eFlags & ~JUMP_LINK_TYPE_EFLAG
+				| JumpLinkType.VALUES.indexOf(newJumpLinkType) << JUMP_LINK_TYPE_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__JUMP_LINK_TYPE, oldJumpLinkType, newJumpLinkType));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__JUMP_LINK_TYPE,
+					oldJumpLinkType, newJumpLinkType));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isJumpLinksReverse() {
@@ -524,20 +568,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJumpLinksReverse(boolean newJumpLinksReverse) {
 		boolean oldJumpLinksReverse = (eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0;
-		if (newJumpLinksReverse) eFlags |= JUMP_LINKS_REVERSE_EFLAG; else eFlags &= ~JUMP_LINKS_REVERSE_EFLAG;
+		if (newJumpLinksReverse)
+			eFlags |= JUMP_LINKS_REVERSE_EFLAG;
+		else
+			eFlags &= ~JUMP_LINKS_REVERSE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE, oldJumpLinksReverse, newJumpLinksReverse));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE,
+					oldJumpLinksReverse, newJumpLinksReverse));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getRoundedBendpointsRadius() {
@@ -545,20 +593,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRoundedBendpointsRadius(int newRoundedBendpointsRadius) {
 		int oldRoundedBendpointsRadius = roundedBendpointsRadius;
 		roundedBendpointsRadius = newRoundedBendpointsRadius;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS, oldRoundedBendpointsRadius, roundedBendpointsRadius));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS,
+					oldRoundedBendpointsRadius, roundedBendpointsRadius));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineColor() {
@@ -566,20 +615,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineColor(int newLineColor) {
 		int oldLineColor = lineColor;
 		lineColor = newLineColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__LINE_COLOR, oldLineColor, lineColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__LINE_COLOR, oldLineColor,
+					lineColor));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineWidth() {
@@ -587,418 +637,452 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineWidth(int newLineWidth) {
 		int oldLineWidth = lineWidth;
 		lineWidth = newLineWidth;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__LINE_WIDTH, oldLineWidth, lineWidth));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR__LINE_WIDTH, oldLineWidth,
+					lineWidth));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.CONNECTOR__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.CONNECTOR__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.CONNECTOR__TYPE:
-				return getType();
-			case NotationPackage.CONNECTOR__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.CONNECTOR__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.CONNECTOR__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.CONNECTOR__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.CONNECTOR__STYLES:
-				return getStyles();
-			case NotationPackage.CONNECTOR__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.CONNECTOR__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.CONNECTOR__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.CONNECTOR__SOURCE:
-				return getSource();
-			case NotationPackage.CONNECTOR__TARGET:
-				return getTarget();
-			case NotationPackage.CONNECTOR__BENDPOINTS:
-				return getBendpoints();
-			case NotationPackage.CONNECTOR__SOURCE_ANCHOR:
-				return getSourceAnchor();
-			case NotationPackage.CONNECTOR__TARGET_ANCHOR:
-				return getTargetAnchor();
-			case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
-				return new Integer(getRoundedBendpointsRadius());
-			case NotationPackage.CONNECTOR__ROUTING:
-				return getRouting();
-			case NotationPackage.CONNECTOR__SMOOTHNESS:
-				return getSmoothness();
-			case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
-				return isAvoidObstructions() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
-				return isClosestDistance() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
-				return getJumpLinkStatus();
-			case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
-				return getJumpLinkType();
-			case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
-				return isJumpLinksReverse() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.CONNECTOR__LINE_COLOR:
-				return new Integer(getLineColor());
-			case NotationPackage.CONNECTOR__LINE_WIDTH:
-				return new Integer(getLineWidth());
+		case NotationPackage.CONNECTOR__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.CONNECTOR__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CONNECTOR__TYPE:
+			return getType();
+		case NotationPackage.CONNECTOR__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CONNECTOR__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.CONNECTOR__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.CONNECTOR__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.CONNECTOR__STYLES:
+			return getStyles();
+		case NotationPackage.CONNECTOR__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.CONNECTOR__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.CONNECTOR__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.CONNECTOR__SOURCE:
+			return getSource();
+		case NotationPackage.CONNECTOR__TARGET:
+			return getTarget();
+		case NotationPackage.CONNECTOR__BENDPOINTS:
+			return getBendpoints();
+		case NotationPackage.CONNECTOR__SOURCE_ANCHOR:
+			return getSourceAnchor();
+		case NotationPackage.CONNECTOR__TARGET_ANCHOR:
+			return getTargetAnchor();
+		case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
+			return new Integer(getRoundedBendpointsRadius());
+		case NotationPackage.CONNECTOR__ROUTING:
+			return getRouting();
+		case NotationPackage.CONNECTOR__SMOOTHNESS:
+			return getSmoothness();
+		case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
+			return isAvoidObstructions() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
+			return isClosestDistance() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
+			return getJumpLinkStatus();
+		case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
+			return getJumpLinkType();
+		case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
+			return isJumpLinksReverse() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CONNECTOR__LINE_COLOR:
+			return new Integer(getLineColor());
+		case NotationPackage.CONNECTOR__LINE_WIDTH:
+			return new Integer(getLineWidth());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.CONNECTOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.CONNECTOR__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.CONNECTOR__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.CONNECTOR__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.CONNECTOR__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.CONNECTOR__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.CONNECTOR__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.CONNECTOR__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.CONNECTOR__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.CONNECTOR__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.CONNECTOR__SOURCE:
-				setSource((View)newValue);
-				return;
-			case NotationPackage.CONNECTOR__TARGET:
-				setTarget((View)newValue);
-				return;
-			case NotationPackage.CONNECTOR__BENDPOINTS:
-				setBendpoints((Bendpoints)newValue);
-				return;
-			case NotationPackage.CONNECTOR__SOURCE_ANCHOR:
-				setSourceAnchor((Anchor)newValue);
-				return;
-			case NotationPackage.CONNECTOR__TARGET_ANCHOR:
-				setTargetAnchor((Anchor)newValue);
-				return;
-			case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.CONNECTOR__ROUTING:
-				setRouting((Routing)newValue);
-				return;
-			case NotationPackage.CONNECTOR__SMOOTHNESS:
-				setSmoothness((Smoothness)newValue);
-				return;
-			case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
-				setAvoidObstructions(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
-				setClosestDistance(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
-				setJumpLinkStatus((JumpLinkStatus)newValue);
-				return;
-			case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
-				setJumpLinkType((JumpLinkType)newValue);
-				return;
-			case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
-				setJumpLinksReverse(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.CONNECTOR__LINE_COLOR:
-				setLineColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.CONNECTOR__LINE_WIDTH:
-				setLineWidth(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.CONNECTOR__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.CONNECTOR__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.CONNECTOR__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.CONNECTOR__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.CONNECTOR__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.CONNECTOR__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.CONNECTOR__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.CONNECTOR__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.CONNECTOR__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.CONNECTOR__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.CONNECTOR__SOURCE:
+			setSource((View) newValue);
+			return;
+		case NotationPackage.CONNECTOR__TARGET:
+			setTarget((View) newValue);
+			return;
+		case NotationPackage.CONNECTOR__BENDPOINTS:
+			setBendpoints((Bendpoints) newValue);
+			return;
+		case NotationPackage.CONNECTOR__SOURCE_ANCHOR:
+			setSourceAnchor((Anchor) newValue);
+			return;
+		case NotationPackage.CONNECTOR__TARGET_ANCHOR:
+			setTargetAnchor((Anchor) newValue);
+			return;
+		case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.CONNECTOR__ROUTING:
+			setRouting((Routing) newValue);
+			return;
+		case NotationPackage.CONNECTOR__SMOOTHNESS:
+			setSmoothness((Smoothness) newValue);
+			return;
+		case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
+			setAvoidObstructions(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
+			setClosestDistance(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
+			setJumpLinkStatus((JumpLinkStatus) newValue);
+			return;
+		case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
+			setJumpLinkType((JumpLinkType) newValue);
+			return;
+		case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
+			setJumpLinksReverse(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.CONNECTOR__LINE_COLOR:
+			setLineColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.CONNECTOR__LINE_WIDTH:
+			setLineWidth(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.CONNECTOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.CONNECTOR__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.CONNECTOR__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.CONNECTOR__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.CONNECTOR__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.CONNECTOR__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.CONNECTOR__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.CONNECTOR__SOURCE:
-				setSource((View)null);
-				return;
-			case NotationPackage.CONNECTOR__TARGET:
-				setTarget((View)null);
-				return;
-			case NotationPackage.CONNECTOR__BENDPOINTS:
-				setBendpoints((Bendpoints)null);
-				return;
-			case NotationPackage.CONNECTOR__SOURCE_ANCHOR:
-				setSourceAnchor((Anchor)null);
-				return;
-			case NotationPackage.CONNECTOR__TARGET_ANCHOR:
-				setTargetAnchor((Anchor)null);
-				return;
-			case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__ROUTING:
-				setRouting(ROUTING_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__SMOOTHNESS:
-				setSmoothness(SMOOTHNESS_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
-				setAvoidObstructions(AVOID_OBSTRUCTIONS_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
-				setClosestDistance(CLOSEST_DISTANCE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
-				setJumpLinkStatus(JUMP_LINK_STATUS_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
-				setJumpLinkType(JUMP_LINK_TYPE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
-				setJumpLinksReverse(JUMP_LINKS_REVERSE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__LINE_COLOR:
-				setLineColor(LINE_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR__LINE_WIDTH:
-				setLineWidth(LINE_WIDTH_EDEFAULT);
-				return;
+		case NotationPackage.CONNECTOR__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.CONNECTOR__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.CONNECTOR__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.CONNECTOR__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.CONNECTOR__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.CONNECTOR__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.CONNECTOR__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.CONNECTOR__SOURCE:
+			setSource((View) null);
+			return;
+		case NotationPackage.CONNECTOR__TARGET:
+			setTarget((View) null);
+			return;
+		case NotationPackage.CONNECTOR__BENDPOINTS:
+			setBendpoints((Bendpoints) null);
+			return;
+		case NotationPackage.CONNECTOR__SOURCE_ANCHOR:
+			setSourceAnchor((Anchor) null);
+			return;
+		case NotationPackage.CONNECTOR__TARGET_ANCHOR:
+			setTargetAnchor((Anchor) null);
+			return;
+		case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__ROUTING:
+			setRouting(ROUTING_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__SMOOTHNESS:
+			setSmoothness(SMOOTHNESS_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
+			setAvoidObstructions(AVOID_OBSTRUCTIONS_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
+			setClosestDistance(CLOSEST_DISTANCE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
+			setJumpLinkStatus(JUMP_LINK_STATUS_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
+			setJumpLinkType(JUMP_LINK_TYPE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
+			setJumpLinksReverse(JUMP_LINKS_REVERSE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__LINE_COLOR:
+			setLineColor(LINE_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR__LINE_WIDTH:
+			setLineWidth(LINE_WIDTH_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.CONNECTOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.CONNECTOR__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.CONNECTOR__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.CONNECTOR__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.CONNECTOR__SOURCE_EDGES:
-				return sourceEdges != null && !sourceEdges.isEmpty();
-			case NotationPackage.CONNECTOR__TARGET_EDGES:
-				return targetEdges != null && !targetEdges.isEmpty();
-			case NotationPackage.CONNECTOR__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.CONNECTOR__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.CONNECTOR__ELEMENT:
-				return isSetElement();
-			case NotationPackage.CONNECTOR__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.CONNECTOR__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.CONNECTOR__SOURCE:
-				return source != null;
-			case NotationPackage.CONNECTOR__TARGET:
-				return target != null;
-			case NotationPackage.CONNECTOR__BENDPOINTS:
-				return bendpoints != null;
-			case NotationPackage.CONNECTOR__SOURCE_ANCHOR:
-				return sourceAnchor != null;
-			case NotationPackage.CONNECTOR__TARGET_ANCHOR:
-				return targetAnchor != null;
-			case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
-				return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
-			case NotationPackage.CONNECTOR__ROUTING:
-				return (eFlags & ROUTING_EFLAG) != ROUTING_EFLAG_DEFAULT;
-			case NotationPackage.CONNECTOR__SMOOTHNESS:
-				return (eFlags & SMOOTHNESS_EFLAG) != SMOOTHNESS_EFLAG_DEFAULT;
-			case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
-				return ((eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0) != AVOID_OBSTRUCTIONS_EDEFAULT;
-			case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
-				return ((eFlags & CLOSEST_DISTANCE_EFLAG) != 0) != CLOSEST_DISTANCE_EDEFAULT;
-			case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
-				return (eFlags & JUMP_LINK_STATUS_EFLAG) != JUMP_LINK_STATUS_EFLAG_DEFAULT;
-			case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
-				return (eFlags & JUMP_LINK_TYPE_EFLAG) != JUMP_LINK_TYPE_EFLAG_DEFAULT;
-			case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
-				return ((eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0) != JUMP_LINKS_REVERSE_EDEFAULT;
-			case NotationPackage.CONNECTOR__LINE_COLOR:
-				return lineColor != LINE_COLOR_EDEFAULT;
-			case NotationPackage.CONNECTOR__LINE_WIDTH:
-				return lineWidth != LINE_WIDTH_EDEFAULT;
+		case NotationPackage.CONNECTOR__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.CONNECTOR__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.CONNECTOR__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.CONNECTOR__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.CONNECTOR__SOURCE_EDGES:
+			return sourceEdges != null && !sourceEdges.isEmpty();
+		case NotationPackage.CONNECTOR__TARGET_EDGES:
+			return targetEdges != null && !targetEdges.isEmpty();
+		case NotationPackage.CONNECTOR__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.CONNECTOR__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.CONNECTOR__ELEMENT:
+			return isSetElement();
+		case NotationPackage.CONNECTOR__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.CONNECTOR__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.CONNECTOR__SOURCE:
+			return source != null;
+		case NotationPackage.CONNECTOR__TARGET:
+			return target != null;
+		case NotationPackage.CONNECTOR__BENDPOINTS:
+			return bendpoints != null;
+		case NotationPackage.CONNECTOR__SOURCE_ANCHOR:
+			return sourceAnchor != null;
+		case NotationPackage.CONNECTOR__TARGET_ANCHOR:
+			return targetAnchor != null;
+		case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
+			return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
+		case NotationPackage.CONNECTOR__ROUTING:
+			return (eFlags & ROUTING_EFLAG) != ROUTING_EFLAG_DEFAULT;
+		case NotationPackage.CONNECTOR__SMOOTHNESS:
+			return (eFlags & SMOOTHNESS_EFLAG) != SMOOTHNESS_EFLAG_DEFAULT;
+		case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
+			return ((eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0) != AVOID_OBSTRUCTIONS_EDEFAULT;
+		case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
+			return ((eFlags & CLOSEST_DISTANCE_EFLAG) != 0) != CLOSEST_DISTANCE_EDEFAULT;
+		case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
+			return (eFlags & JUMP_LINK_STATUS_EFLAG) != JUMP_LINK_STATUS_EFLAG_DEFAULT;
+		case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
+			return (eFlags & JUMP_LINK_TYPE_EFLAG) != JUMP_LINK_TYPE_EFLAG_DEFAULT;
+		case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
+			return ((eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0) != JUMP_LINKS_REVERSE_EDEFAULT;
+		case NotationPackage.CONNECTOR__LINE_COLOR:
+			return lineColor != LINE_COLOR_EDEFAULT;
+		case NotationPackage.CONNECTOR__LINE_WIDTH:
+			return lineWidth != LINE_WIDTH_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == RoundedCornersStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS: return NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS;
-				default: return -1;
+			case NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS:
+				return NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == RoutingStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.CONNECTOR__ROUTING: return NotationPackage.ROUTING_STYLE__ROUTING;
-				case NotationPackage.CONNECTOR__SMOOTHNESS: return NotationPackage.ROUTING_STYLE__SMOOTHNESS;
-				case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS: return NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS;
-				case NotationPackage.CONNECTOR__CLOSEST_DISTANCE: return NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE;
-				case NotationPackage.CONNECTOR__JUMP_LINK_STATUS: return NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS;
-				case NotationPackage.CONNECTOR__JUMP_LINK_TYPE: return NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE;
-				case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE: return NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE;
-				default: return -1;
+			case NotationPackage.CONNECTOR__ROUTING:
+				return NotationPackage.ROUTING_STYLE__ROUTING;
+			case NotationPackage.CONNECTOR__SMOOTHNESS:
+				return NotationPackage.ROUTING_STYLE__SMOOTHNESS;
+			case NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS:
+				return NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS;
+			case NotationPackage.CONNECTOR__CLOSEST_DISTANCE:
+				return NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE;
+			case NotationPackage.CONNECTOR__JUMP_LINK_STATUS:
+				return NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS;
+			case NotationPackage.CONNECTOR__JUMP_LINK_TYPE:
+				return NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE;
+			case NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE:
+				return NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == LineStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.CONNECTOR__LINE_COLOR: return NotationPackage.LINE_STYLE__LINE_COLOR;
-				case NotationPackage.CONNECTOR__LINE_WIDTH: return NotationPackage.LINE_STYLE__LINE_WIDTH;
-				default: return -1;
+			case NotationPackage.CONNECTOR__LINE_COLOR:
+				return NotationPackage.LINE_STYLE__LINE_COLOR;
+			case NotationPackage.CONNECTOR__LINE_WIDTH:
+				return NotationPackage.LINE_STYLE__LINE_WIDTH;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == ConnectorStyle.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == RoundedCornersStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS: return NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS;
-				default: return -1;
+			case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+				return NotationPackage.CONNECTOR__ROUNDED_BENDPOINTS_RADIUS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == RoutingStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.ROUTING_STYLE__ROUTING: return NotationPackage.CONNECTOR__ROUTING;
-				case NotationPackage.ROUTING_STYLE__SMOOTHNESS: return NotationPackage.CONNECTOR__SMOOTHNESS;
-				case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS: return NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS;
-				case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE: return NotationPackage.CONNECTOR__CLOSEST_DISTANCE;
-				case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS: return NotationPackage.CONNECTOR__JUMP_LINK_STATUS;
-				case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE: return NotationPackage.CONNECTOR__JUMP_LINK_TYPE;
-				case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE: return NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE;
-				default: return -1;
+			case NotationPackage.ROUTING_STYLE__ROUTING:
+				return NotationPackage.CONNECTOR__ROUTING;
+			case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
+				return NotationPackage.CONNECTOR__SMOOTHNESS;
+			case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
+				return NotationPackage.CONNECTOR__AVOID_OBSTRUCTIONS;
+			case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
+				return NotationPackage.CONNECTOR__CLOSEST_DISTANCE;
+			case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
+				return NotationPackage.CONNECTOR__JUMP_LINK_STATUS;
+			case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
+				return NotationPackage.CONNECTOR__JUMP_LINK_TYPE;
+			case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
+				return NotationPackage.CONNECTOR__JUMP_LINKS_REVERSE;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == LineStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.LINE_STYLE__LINE_COLOR: return NotationPackage.CONNECTOR__LINE_COLOR;
-				case NotationPackage.LINE_STYLE__LINE_WIDTH: return NotationPackage.CONNECTOR__LINE_WIDTH;
-				default: return -1;
+			case NotationPackage.LINE_STYLE__LINE_COLOR:
+				return NotationPackage.CONNECTOR__LINE_COLOR;
+			case NotationPackage.LINE_STYLE__LINE_WIDTH:
+				return NotationPackage.CONNECTOR__LINE_WIDTH;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == ConnectorStyle.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (roundedBendpointsRadius: "); //$NON-NLS-1$
@@ -1012,7 +1096,8 @@
 		result.append(", closestDistance: "); //$NON-NLS-1$
 		result.append((eFlags & CLOSEST_DISTANCE_EFLAG) != 0);
 		result.append(", jumpLinkStatus: "); //$NON-NLS-1$
-		result.append(JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags & JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET]);
+		result.append(
+				JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags & JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET]);
 		result.append(", jumpLinkType: "); //$NON-NLS-1$
 		result.append(JUMP_LINK_TYPE_EFLAG_VALUES[(eFlags & JUMP_LINK_TYPE_EFLAG) >>> JUMP_LINK_TYPE_EFLAG_OFFSET]);
 		result.append(", jumpLinksReverse: "); //$NON-NLS-1$
@@ -1025,4 +1110,4 @@
 		return result.toString();
 	}
 
-} //ConnectorImpl
+} // ConnectorImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ConnectorStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ConnectorStyleImpl.java
index f7186da..561b261 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ConnectorStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ConnectorStyleImpl.java
@@ -24,16 +24,17 @@
 import org.eclipse.gmf.runtime.notation.Smoothness;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Connector Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Connector Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl#getLineColor <em>Line Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl#getLineWidth <em>Line Width</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl#getLineColor
+ * <em>Line Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl#getLineWidth
+ * <em>Line Width</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -41,290 +42,299 @@
  * @canBeSeenBy %partners
  */
 public class ConnectorStyleImpl extends RoutingStyleImpl implements ConnectorStyle {
-	
-    /**
-	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int LINE_COLOR_EDEFAULT = 11579568;
 
-    /**
-	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected int lineColor = LINE_COLOR_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int LINE_WIDTH_EDEFAULT = -1;
 
-				/**
-	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected int lineWidth = LINE_WIDTH_EDEFAULT;
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConnectorStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.CONNECTOR_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineColor() {
 		return lineColor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineColor(int newLineColor) {
 		int oldLineColor = lineColor;
 		lineColor = newLineColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR_STYLE__LINE_COLOR, oldLineColor, lineColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR_STYLE__LINE_COLOR,
+					oldLineColor, lineColor));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineWidth() {
 		return lineWidth;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineWidth(int newLineWidth) {
 		int oldLineWidth = lineWidth;
 		lineWidth = newLineWidth;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR_STYLE__LINE_WIDTH, oldLineWidth, lineWidth));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.CONNECTOR_STYLE__LINE_WIDTH,
+					oldLineWidth, lineWidth));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				return new Integer(getRoundedBendpointsRadius());
-			case NotationPackage.CONNECTOR_STYLE__ROUTING:
-				return getRouting();
-			case NotationPackage.CONNECTOR_STYLE__SMOOTHNESS:
-				return getSmoothness();
-			case NotationPackage.CONNECTOR_STYLE__AVOID_OBSTRUCTIONS:
-				return isAvoidObstructions() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.CONNECTOR_STYLE__CLOSEST_DISTANCE:
-				return isClosestDistance() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_STATUS:
-				return getJumpLinkStatus();
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_TYPE:
-				return getJumpLinkType();
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINKS_REVERSE:
-				return isJumpLinksReverse() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
-				return new Integer(getLineColor());
-			case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
-				return new Integer(getLineWidth());
+		case NotationPackage.CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			return new Integer(getRoundedBendpointsRadius());
+		case NotationPackage.CONNECTOR_STYLE__ROUTING:
+			return getRouting();
+		case NotationPackage.CONNECTOR_STYLE__SMOOTHNESS:
+			return getSmoothness();
+		case NotationPackage.CONNECTOR_STYLE__AVOID_OBSTRUCTIONS:
+			return isAvoidObstructions() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CONNECTOR_STYLE__CLOSEST_DISTANCE:
+			return isClosestDistance() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_STATUS:
+			return getJumpLinkStatus();
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_TYPE:
+			return getJumpLinkType();
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINKS_REVERSE:
+			return isJumpLinksReverse() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
+			return new Integer(getLineColor());
+		case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
+			return new Integer(getLineWidth());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.CONNECTOR_STYLE__ROUTING:
-				setRouting((Routing)newValue);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__SMOOTHNESS:
-				setSmoothness((Smoothness)newValue);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__AVOID_OBSTRUCTIONS:
-				setAvoidObstructions(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.CONNECTOR_STYLE__CLOSEST_DISTANCE:
-				setClosestDistance(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_STATUS:
-				setJumpLinkStatus((JumpLinkStatus)newValue);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_TYPE:
-				setJumpLinkType((JumpLinkType)newValue);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINKS_REVERSE:
-				setJumpLinksReverse(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
-				setLineColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
-				setLineWidth(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.CONNECTOR_STYLE__ROUTING:
+			setRouting((Routing) newValue);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__SMOOTHNESS:
+			setSmoothness((Smoothness) newValue);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__AVOID_OBSTRUCTIONS:
+			setAvoidObstructions(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.CONNECTOR_STYLE__CLOSEST_DISTANCE:
+			setClosestDistance(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_STATUS:
+			setJumpLinkStatus((JumpLinkStatus) newValue);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_TYPE:
+			setJumpLinkType((JumpLinkType) newValue);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINKS_REVERSE:
+			setJumpLinksReverse(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
+			setLineColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
+			setLineWidth(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__ROUTING:
-				setRouting(ROUTING_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__SMOOTHNESS:
-				setSmoothness(SMOOTHNESS_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__AVOID_OBSTRUCTIONS:
-				setAvoidObstructions(AVOID_OBSTRUCTIONS_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__CLOSEST_DISTANCE:
-				setClosestDistance(CLOSEST_DISTANCE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_STATUS:
-				setJumpLinkStatus(JUMP_LINK_STATUS_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_TYPE:
-				setJumpLinkType(JUMP_LINK_TYPE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINKS_REVERSE:
-				setJumpLinksReverse(JUMP_LINKS_REVERSE_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
-				setLineColor(LINE_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
-				setLineWidth(LINE_WIDTH_EDEFAULT);
-				return;
+		case NotationPackage.CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__ROUTING:
+			setRouting(ROUTING_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__SMOOTHNESS:
+			setSmoothness(SMOOTHNESS_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__AVOID_OBSTRUCTIONS:
+			setAvoidObstructions(AVOID_OBSTRUCTIONS_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__CLOSEST_DISTANCE:
+			setClosestDistance(CLOSEST_DISTANCE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_STATUS:
+			setJumpLinkStatus(JUMP_LINK_STATUS_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_TYPE:
+			setJumpLinkType(JUMP_LINK_TYPE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINKS_REVERSE:
+			setJumpLinksReverse(JUMP_LINKS_REVERSE_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
+			setLineColor(LINE_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
+			setLineWidth(LINE_WIDTH_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__ROUTING:
-				return (eFlags & ROUTING_EFLAG) != ROUTING_EFLAG_DEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__SMOOTHNESS:
-				return (eFlags & SMOOTHNESS_EFLAG) != SMOOTHNESS_EFLAG_DEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__AVOID_OBSTRUCTIONS:
-				return ((eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0) != AVOID_OBSTRUCTIONS_EDEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__CLOSEST_DISTANCE:
-				return ((eFlags & CLOSEST_DISTANCE_EFLAG) != 0) != CLOSEST_DISTANCE_EDEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_STATUS:
-				return (eFlags & JUMP_LINK_STATUS_EFLAG) != JUMP_LINK_STATUS_EFLAG_DEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_TYPE:
-				return (eFlags & JUMP_LINK_TYPE_EFLAG) != JUMP_LINK_TYPE_EFLAG_DEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__JUMP_LINKS_REVERSE:
-				return ((eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0) != JUMP_LINKS_REVERSE_EDEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
-				return lineColor != LINE_COLOR_EDEFAULT;
-			case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
-				return lineWidth != LINE_WIDTH_EDEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__ROUTING:
+			return (eFlags & ROUTING_EFLAG) != ROUTING_EFLAG_DEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__SMOOTHNESS:
+			return (eFlags & SMOOTHNESS_EFLAG) != SMOOTHNESS_EFLAG_DEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__AVOID_OBSTRUCTIONS:
+			return ((eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0) != AVOID_OBSTRUCTIONS_EDEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__CLOSEST_DISTANCE:
+			return ((eFlags & CLOSEST_DISTANCE_EFLAG) != 0) != CLOSEST_DISTANCE_EDEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_STATUS:
+			return (eFlags & JUMP_LINK_STATUS_EFLAG) != JUMP_LINK_STATUS_EFLAG_DEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINK_TYPE:
+			return (eFlags & JUMP_LINK_TYPE_EFLAG) != JUMP_LINK_TYPE_EFLAG_DEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__JUMP_LINKS_REVERSE:
+			return ((eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0) != JUMP_LINKS_REVERSE_EDEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
+			return lineColor != LINE_COLOR_EDEFAULT;
+		case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
+			return lineWidth != LINE_WIDTH_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == LineStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.CONNECTOR_STYLE__LINE_COLOR: return NotationPackage.LINE_STYLE__LINE_COLOR;
-				case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH: return NotationPackage.LINE_STYLE__LINE_WIDTH;
-				default: return -1;
+			case NotationPackage.CONNECTOR_STYLE__LINE_COLOR:
+				return NotationPackage.LINE_STYLE__LINE_COLOR;
+			case NotationPackage.CONNECTOR_STYLE__LINE_WIDTH:
+				return NotationPackage.LINE_STYLE__LINE_WIDTH;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == LineStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.LINE_STYLE__LINE_COLOR: return NotationPackage.CONNECTOR_STYLE__LINE_COLOR;
-				case NotationPackage.LINE_STYLE__LINE_WIDTH: return NotationPackage.CONNECTOR_STYLE__LINE_WIDTH;
-				default: return -1;
+			case NotationPackage.LINE_STYLE__LINE_COLOR:
+				return NotationPackage.CONNECTOR_STYLE__LINE_COLOR;
+			case NotationPackage.LINE_STYLE__LINE_WIDTH:
+				return NotationPackage.CONNECTOR_STYLE__LINE_WIDTH;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (lineColor: "); //$NON-NLS-1$
@@ -335,4 +345,4 @@
 		return result.toString();
 	}
 
-} //ConnectorStyleImpl
+} // ConnectorStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DataTypeStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DataTypeStyleImpl.java
index cdeae72..529deb2 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DataTypeStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DataTypeStyleImpl.java
@@ -21,23 +21,23 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Type Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Data
+ * Type Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl#getInstanceType <em>Instance Type</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl#getInstanceType
+ * <em>Instance Type</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class DataTypeStyleImpl extends NamedStyleImpl implements DataTypeStyle {
 	/**
-	 * The cached value of the '{@link #getInstanceType() <em>Instance Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getInstanceType() <em>Instance Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getInstanceType()
 	 * @generated
 	 * @ordered
@@ -45,8 +45,8 @@
 	protected EDataType instanceType;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DataTypeStyleImpl() {
@@ -54,8 +54,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -63,25 +63,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getInstanceType() {
 		if (instanceType != null && instanceType.eIsProxy()) {
-			InternalEObject oldInstanceType = (InternalEObject)instanceType;
-			instanceType = (EDataType)eResolveProxy(oldInstanceType);
+			InternalEObject oldInstanceType = (InternalEObject) instanceType;
+			instanceType = (EDataType) eResolveProxy(oldInstanceType);
 			if (instanceType != oldInstanceType) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE, oldInstanceType, instanceType));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE, oldInstanceType, instanceType));
 			}
 		}
 		return instanceType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType basicGetInstanceType() {
@@ -89,31 +90,32 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setInstanceType(EDataType newInstanceType) {
 		EDataType oldInstanceType = instanceType;
 		instanceType = newInstanceType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE, oldInstanceType, instanceType));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE,
+					oldInstanceType, instanceType));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public String getStringFromObject(Object objectValue) {
 		if (getInstanceType() == null && objectValue instanceof String)
-			return (String)objectValue;
+			return (String) objectValue;
 		return EcoreUtil.convertToString(getInstanceType(), objectValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public Object getObjectFromString(String stringValue) {
@@ -123,68 +125,69 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DATA_TYPE_STYLE__NAME:
-				return getName();
-			case NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE:
-				if (resolve) return getInstanceType();
-				return basicGetInstanceType();
+		case NotationPackage.DATA_TYPE_STYLE__NAME:
+			return getName();
+		case NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE:
+			if (resolve)
+				return getInstanceType();
+			return basicGetInstanceType();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DATA_TYPE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE:
-				setInstanceType((EDataType)newValue);
-				return;
+		case NotationPackage.DATA_TYPE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE:
+			setInstanceType((EDataType) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DATA_TYPE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE:
-				setInstanceType((EDataType)null);
-				return;
+		case NotationPackage.DATA_TYPE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE:
+			setInstanceType((EDataType) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DATA_TYPE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE:
-				return instanceType != null;
+		case NotationPackage.DATA_TYPE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.DATA_TYPE_STYLE__INSTANCE_TYPE:
+			return instanceType != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //DataTypeStyleImpl
+} // DataTypeStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DecorationNodeImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DecorationNodeImpl.java
index b409d04..67bf023 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DecorationNodeImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DecorationNodeImpl.java
@@ -30,9 +30,8 @@
 import org.eclipse.gmf.runtime.notation.Style;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Decoration Node</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Decoration Node</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
  *
@@ -43,216 +42,220 @@
 
 	protected LayoutConstraint layoutConstraint;
 
-    protected EList persistedChildren;
+	protected EList persistedChildren;
 
-    protected EList styles;
+	protected EList styles;
 
-    protected EList transientChildren;
+	protected EList transientChildren;
 
-    // EATM
-    // private EContentsEList allChildren = null;
+	// EATM
+	// private EContentsEList allChildren = null;
 
-    protected DecorationNodeImpl() {
+	protected DecorationNodeImpl() {
 		super();
 	}
 
-    protected EClass eStaticClass() {
+	protected EClass eStaticClass() {
 		return NotationPackage.Literals.DECORATION_NODE;
 	}
 
-    public EList getPersistedChildren() {
+	public EList getPersistedChildren() {
 		if (persistedChildren == null) {
 			persistedChildren = new EObjectContainmentEList(Node.class, this, NotationPackage.VIEW__PERSISTED_CHILDREN);
 		}
 		return persistedChildren;
 	}
 
-    public EList getChildren() {
-        return new EContentsEList(this, childrenFeatures);
-        // if (allChildren == null) {
-        //     allChildren = new EContentsEList(this, childrenFeatures);
-        // }
-        // return allChildren;
-    }
+	public EList getChildren() {
+		return new EContentsEList(this, childrenFeatures);
+		// if (allChildren == null) {
+		// allChildren = new EContentsEList(this, childrenFeatures);
+		// }
+		// return allChildren;
+	}
 
-    public EList getStyles() {
+	public EList getStyles() {
 		if (styles == null) {
 			styles = new EObjectContainmentEList(Style.class, this, NotationPackage.VIEW__STYLES);
 		}
 		return styles;
 	}
 
-    public EList getTransientChildren() {
+	public EList getTransientChildren() {
 		if (transientChildren == null) {
 			transientChildren = new EObjectContainmentEList(Node.class, this, NotationPackage.VIEW__TRANSIENT_CHILDREN);
 		}
 		return transientChildren;
 	}
 
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.DECORATION_NODE__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
-				return ((InternalEList)getSourceEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DECORATION_NODE__TARGET_EDGES:
-				return ((InternalEList)getTargetEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
-				return ((InternalEList)getPersistedChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DECORATION_NODE__STYLES:
-				return ((InternalEList)getStyles()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
-				return ((InternalEList)getTransientChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
-				return basicSetLayoutConstraint(null, msgs);
+		case NotationPackage.DECORATION_NODE__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
+			return ((InternalEList) getSourceEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DECORATION_NODE__TARGET_EDGES:
+			return ((InternalEList) getTargetEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
+			return ((InternalEList) getPersistedChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DECORATION_NODE__STYLES:
+			return ((InternalEList) getStyles()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
+			return ((InternalEList) getTransientChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
+			return basicSetLayoutConstraint(null, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DECORATION_NODE__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.DECORATION_NODE__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.DECORATION_NODE__TYPE:
-				return getType();
-			case NotationPackage.DECORATION_NODE__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.DECORATION_NODE__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.DECORATION_NODE__STYLES:
-				return getStyles();
-			case NotationPackage.DECORATION_NODE__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.DECORATION_NODE__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
+		case NotationPackage.DECORATION_NODE__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.DECORATION_NODE__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.DECORATION_NODE__TYPE:
+			return getType();
+		case NotationPackage.DECORATION_NODE__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.DECORATION_NODE__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.DECORATION_NODE__STYLES:
+			return getStyles();
+		case NotationPackage.DECORATION_NODE__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.DECORATION_NODE__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DECORATION_NODE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DECORATION_NODE__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.DECORATION_NODE__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.DECORATION_NODE__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
-			case NotationPackage.DECORATION_NODE__TARGET_EDGES:
-				return;
-			case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DECORATION_NODE__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DECORATION_NODE__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)newValue);
-				return;
+		case NotationPackage.DECORATION_NODE__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DECORATION_NODE__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.DECORATION_NODE__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.DECORATION_NODE__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
+		case NotationPackage.DECORATION_NODE__TARGET_EDGES:
+			return;
+		case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DECORATION_NODE__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DECORATION_NODE__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DECORATION_NODE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.DECORATION_NODE__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.DECORATION_NODE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.DECORATION_NODE__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
-			case NotationPackage.DECORATION_NODE__TARGET_EDGES:
-				return;
-			case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.DECORATION_NODE__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.DECORATION_NODE__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)null);
-				return;
+		case NotationPackage.DECORATION_NODE__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.DECORATION_NODE__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.DECORATION_NODE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.DECORATION_NODE__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
+		case NotationPackage.DECORATION_NODE__TARGET_EDGES:
+			return;
+		case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.DECORATION_NODE__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.DECORATION_NODE__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DECORATION_NODE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.DECORATION_NODE__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.DECORATION_NODE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.DECORATION_NODE__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
-				return false;
-			case NotationPackage.DECORATION_NODE__TARGET_EDGES:
-				return false;
-			case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.DECORATION_NODE__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.DECORATION_NODE__ELEMENT:
-				return isSetElement();
-			case NotationPackage.DECORATION_NODE__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
-				return layoutConstraint != null;
+		case NotationPackage.DECORATION_NODE__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.DECORATION_NODE__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.DECORATION_NODE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.DECORATION_NODE__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.DECORATION_NODE__SOURCE_EDGES:
+			return false;
+		case NotationPackage.DECORATION_NODE__TARGET_EDGES:
+			return false;
+		case NotationPackage.DECORATION_NODE__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.DECORATION_NODE__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.DECORATION_NODE__ELEMENT:
+			return isSetElement();
+		case NotationPackage.DECORATION_NODE__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.DECORATION_NODE__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT:
+			return layoutConstraint != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public String toString() {
-		if (eIsProxy()) return super.toString();
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (visible: "); //$NON-NLS-1$
@@ -269,22 +272,29 @@
 		if (newLayoutConstraint != layoutConstraint) {
 			NotificationChain msgs = null;
 			if (layoutConstraint != null)
-				msgs = ((InternalEObject)layoutConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
+				msgs = ((InternalEObject) layoutConstraint).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
 			if (newLayoutConstraint != null)
-				msgs = ((InternalEObject)newLayoutConstraint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
+				msgs = ((InternalEObject) newLayoutConstraint).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
 			msgs = basicSetLayoutConstraint(newLayoutConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT, newLayoutConstraint, newLayoutConstraint));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT,
+					newLayoutConstraint, newLayoutConstraint));
 	}
 
 	public NotificationChain basicSetLayoutConstraint(LayoutConstraint newLayoutConstraint, NotificationChain msgs) {
 		LayoutConstraint oldLayoutConstraint = layoutConstraint;
 		layoutConstraint = newLayoutConstraint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT, oldLayoutConstraint, newLayoutConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.DECORATION_NODE__LAYOUT_CONSTRAINT, oldLayoutConstraint, newLayoutConstraint);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -293,4 +303,4 @@
 		return layoutConstraint;
 	}
 
-} //DecorationNodeImpl
+} // DecorationNodeImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DescriptionStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DescriptionStyleImpl.java
index 6497dae..db25064 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DescriptionStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DescriptionStyleImpl.java
@@ -20,15 +20,15 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Description Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl#getDescription <em>Description</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl#getDescription
+ * <em>Description</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -36,126 +36,128 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class DescriptionStyleImpl extends MinimalEObjectImpl.Container implements DescriptionStyle {
-    /**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final String DESCRIPTION_EDEFAULT = ""; //$NON-NLS-1$
 
-    /**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
 	 */
 	protected String description = DESCRIPTION_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DescriptionStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.DESCRIPTION_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDescription() {
 		return description;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDescription(String newDescription) {
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DESCRIPTION_STYLE__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DESCRIPTION_STYLE__DESCRIPTION,
+					oldDescription, description));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
-				return getDescription();
+		case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
+			return getDescription();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
+		case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
+		case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (description: "); //$NON-NLS-1$
@@ -164,4 +166,4 @@
 		return result.toString();
 	}
 
-} //DescriptionStyleImpl
+} // DescriptionStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramImpl.java
index 8ede091..f9336bf 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramImpl.java
@@ -35,88 +35,97 @@
 import org.eclipse.gmf.runtime.notation.View;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Diagram</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Diagram</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl#getMeasurementUnit <em>Measurement Unit</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl#getPersistedEdges <em>Persisted Edges</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl#getTransientEdges <em>Transient Edges</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl#getName
+ * <em>Name</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl#getMeasurementUnit
+ * <em>Measurement Unit</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl#getPersistedEdges
+ * <em>Persisted Edges</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl#getTransientEdges
+ * <em>Transient Edges</em>}</li>
+ * </ul>
  *
  * @generated
  */
 /*
  * @canBeSeenBy %partners
  */
-public class DiagramImpl
-    extends ViewImpl
-    implements Diagram {
+public class DiagramImpl extends ViewImpl implements Diagram {
 
-    /**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-    protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
+	protected static final String NAME_EDEFAULT = ""; //$NON-NLS-1$
 
-    /**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-    protected String name = NAME_EDEFAULT;
+	protected String name = NAME_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getMeasurementUnit() <em>Measurement Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getMeasurementUnit() <em>Measurement
+	 * Unit</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMeasurementUnit()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final MeasurementUnit MEASUREMENT_UNIT_EDEFAULT = MeasurementUnit.HIMETRIC_LITERAL;
 
-				/**
-	 * The offset of the flags representing the value of the '{@link #getMeasurementUnit() <em>Measurement Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The offset of the flags representing the value of the
+	 * '{@link #getMeasurementUnit() <em>Measurement Unit</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 * @since 1.2
 	 */
 	protected static final int MEASUREMENT_UNIT_EFLAG_OFFSET = 11;
 
-				/**
-	 * The flags representing the default value of the '{@link #getMeasurementUnit() <em>Measurement Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the default value of the '{@link #getMeasurementUnit()
+	 * <em>Measurement Unit</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 * @since 1.2
 	 */
-	protected static final int MEASUREMENT_UNIT_EFLAG_DEFAULT = MeasurementUnit.VALUES.indexOf(MEASUREMENT_UNIT_EDEFAULT) << MEASUREMENT_UNIT_EFLAG_OFFSET;
+	protected static final int MEASUREMENT_UNIT_EFLAG_DEFAULT = MeasurementUnit.VALUES
+			.indexOf(MEASUREMENT_UNIT_EDEFAULT) << MEASUREMENT_UNIT_EFLAG_OFFSET;
 
-				/**
-	 * The array of enumeration values for '{@link MeasurementUnit Measurement Unit}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The array of enumeration values for '{@link MeasurementUnit Measurement
+	 * Unit}' <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final MeasurementUnit[] MEASUREMENT_UNIT_EFLAG_VALUES = (MeasurementUnit[])MeasurementUnit.VALUES.toArray(new MeasurementUnit[MeasurementUnit.VALUES.size()]);
+	private static final MeasurementUnit[] MEASUREMENT_UNIT_EFLAG_VALUES = (MeasurementUnit[]) MeasurementUnit.VALUES
+			.toArray(new MeasurementUnit[MeasurementUnit.VALUES.size()]);
 
-				/**
-	 * The flag representing the value of the '{@link #getMeasurementUnit() <em>Measurement Unit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #getMeasurementUnit()
+	 * <em>Measurement Unit</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMeasurementUnit()
 	 * @generated
 	 * @ordered
@@ -124,77 +133,84 @@
 	 */
 	protected static final int MEASUREMENT_UNIT_EFLAG = 1 << MEASUREMENT_UNIT_EFLAG_OFFSET;
 
-				/**
+	/**
 	 * The flag representing whether the Measurement Unit attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int MEASUREMENT_UNIT_ESETFLAG = 1 << 12;
 
-				/**
-	 * The cached value of the '{@link #getPersistedEdges() <em>Persisted Edges</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getPersistedEdges() <em>Persisted
+	 * Edges</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getPersistedEdges()
 	 * @generated
 	 * @ordered
 	 */
-    protected EList persistedEdges;
+	protected EList persistedEdges;
 
-    /**
-	 * The cached value of the '{@link #getTransientEdges() <em>Transient Edges</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getTransientEdges() <em>Transient
+	 * Edges</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTransientEdges()
 	 * @generated
 	 * @ordered
 	 */
-    protected EList transientEdges;
+	protected EList transientEdges;
 
-    private EContentsEList allEdges = null;
+	private EContentsEList allEdges = null;
 
-    protected static final EStructuralFeature[] edgesFeatures = new EStructuralFeature[] {
-        NotationPackage.Literals.DIAGRAM__PERSISTED_EDGES,
-        NotationPackage.Literals.DIAGRAM__TRANSIENT_EDGES};
+	protected static final EStructuralFeature[] edgesFeatures = new EStructuralFeature[] {
+			NotationPackage.Literals.DIAGRAM__PERSISTED_EDGES, NotationPackage.Literals.DIAGRAM__TRANSIENT_EDGES };
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    protected DiagramImpl() {
+	protected DiagramImpl() {
 		super();
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    protected EClass eStaticClass() {
+	protected EClass eStaticClass() {
 		return NotationPackage.Literals.DIAGRAM;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public String getName() {
+	public String getName() {
 		return name;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void setName(String newName) {
+	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DIAGRAM__NAME, oldName, name));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MeasurementUnit getMeasurementUnit() {
@@ -203,411 +219,429 @@
 
 	/**
 	 * <!-- begin-user-doc --> Set the Measurement Unit for this Diagram, the
-	 * Measurement unit can be set only once, the set method will not set the
-	 * value if it was already set <!-- end-user-doc -->
+	 * Measurement unit can be set only once, the set method will not set the value
+	 * if it was already set <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setMeasurementUnit(MeasurementUnit newMeasurementUnit) {
 		if (!isSetMeasurementUnit()) {
 			setMeasurementUnitGen(newMeasurementUnit);
-		} /*else {
-			throw new UnsupportedOperationException();
-		}*/
+		} /*
+			 * else { throw new UnsupportedOperationException(); }
+			 */
 	}
 
 	/**
 	 * <!-- begin-user-doc --> Set the Measurement Unit for this Diagram, the
-     * Measurement unit can be set only once, the set method will not set the
-     * value if it was already set <!-- end-user-doc -->
+	 * Measurement unit can be set only once, the set method will not set the value
+	 * if it was already set <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void setMeasurementUnitGen(MeasurementUnit newMeasurementUnit) {
-			MeasurementUnit oldMeasurementUnit = MEASUREMENT_UNIT_EFLAG_VALUES[(eFlags & MEASUREMENT_UNIT_EFLAG) >>> MEASUREMENT_UNIT_EFLAG_OFFSET];
-			if (newMeasurementUnit == null) newMeasurementUnit = MEASUREMENT_UNIT_EDEFAULT;
-			eFlags = eFlags & ~MEASUREMENT_UNIT_EFLAG | MeasurementUnit.VALUES.indexOf(newMeasurementUnit) << MEASUREMENT_UNIT_EFLAG_OFFSET;
-			boolean oldMeasurementUnitESet = (eFlags & MEASUREMENT_UNIT_ESETFLAG) != 0;
-			eFlags |= MEASUREMENT_UNIT_ESETFLAG;
-			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DIAGRAM__MEASUREMENT_UNIT, oldMeasurementUnit, newMeasurementUnit, !oldMeasurementUnitESet));
+	public void setMeasurementUnitGen(MeasurementUnit newMeasurementUnit) {
+		MeasurementUnit oldMeasurementUnit = MEASUREMENT_UNIT_EFLAG_VALUES[(eFlags
+				& MEASUREMENT_UNIT_EFLAG) >>> MEASUREMENT_UNIT_EFLAG_OFFSET];
+		if (newMeasurementUnit == null)
+			newMeasurementUnit = MEASUREMENT_UNIT_EDEFAULT;
+		eFlags = eFlags & ~MEASUREMENT_UNIT_EFLAG
+				| MeasurementUnit.VALUES.indexOf(newMeasurementUnit) << MEASUREMENT_UNIT_EFLAG_OFFSET;
+		boolean oldMeasurementUnitESet = (eFlags & MEASUREMENT_UNIT_ESETFLAG) != 0;
+		eFlags |= MEASUREMENT_UNIT_ESETFLAG;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DIAGRAM__MEASUREMENT_UNIT,
+					oldMeasurementUnit, newMeasurementUnit, !oldMeasurementUnitESet));
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void unsetMeasurementUnit() {
-        /*throw new UnsupportedOperationException();*/
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void unsetMeasurementUnit() {
+		/* throw new UnsupportedOperationException(); */
+	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetMeasurementUnit() {
 		return (eFlags & MEASUREMENT_UNIT_ESETFLAG) != 0;
 	}
 
-				/**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public EList getEdges() {
-        if (allEdges == null) {
-            allEdges = new EContentsEList(this, edgesFeatures);
-        }
-        return allEdges;
-    }
-
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public EList getEdges() {
+		if (allEdges == null) {
+			allEdges = new EContentsEList(this, edgesFeatures);
+		}
+		return allEdges;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public EList getPersistedEdges() {
+	public EList getPersistedEdges() {
 		if (persistedEdges == null) {
 			persistedEdges = new EObjectContainmentEList(Edge.class, this, NotationPackage.DIAGRAM__PERSISTED_EDGES);
 		}
 		return persistedEdges;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public EList getTransientEdges() {
+	public EList getTransientEdges() {
 		if (transientEdges == null) {
 			transientEdges = new EObjectContainmentEList(Edge.class, this, NotationPackage.DIAGRAM__TRANSIENT_EDGES);
 		}
 		return transientEdges;
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public Edge createEdge(EClass eClass) {
-        Edge newEdge = (Edge) eClass.getEPackage().getEFactoryInstance()
-            .create(eClass);
-        getPersistedEdges().add(newEdge);
-        return newEdge;
-    }
-
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public Edge createEdge(EClass eClass) {
+		Edge newEdge = (Edge) eClass.getEPackage().getEFactoryInstance().create(eClass);
+		getPersistedEdges().add(newEdge);
+		return newEdge;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DIAGRAM__SOURCE_EDGES:
-				return ((InternalEList)getSourceEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DIAGRAM__TARGET_EDGES:
-				return ((InternalEList)getTargetEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
-				return ((InternalEList)getPersistedChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DIAGRAM__STYLES:
-				return ((InternalEList)getStyles()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
-				return ((InternalEList)getTransientChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DIAGRAM__PERSISTED_EDGES:
-				return ((InternalEList)getPersistedEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
-				return ((InternalEList)getTransientEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM__SOURCE_EDGES:
+			return ((InternalEList) getSourceEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM__TARGET_EDGES:
+			return ((InternalEList) getTargetEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
+			return ((InternalEList) getPersistedChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM__STYLES:
+			return ((InternalEList) getStyles()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
+			return ((InternalEList) getTransientChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM__PERSISTED_EDGES:
+			return ((InternalEList) getPersistedEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
+			return ((InternalEList) getTransientEdges()).basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.DIAGRAM__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.DIAGRAM__TYPE:
-				return getType();
-			case NotationPackage.DIAGRAM__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.DIAGRAM__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.DIAGRAM__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.DIAGRAM__STYLES:
-				return getStyles();
-			case NotationPackage.DIAGRAM__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.DIAGRAM__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.DIAGRAM__NAME:
-				return getName();
-			case NotationPackage.DIAGRAM__MEASUREMENT_UNIT:
-				return getMeasurementUnit();
-			case NotationPackage.DIAGRAM__PERSISTED_EDGES:
-				return getPersistedEdges();
-			case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
-				return getTransientEdges();
+		case NotationPackage.DIAGRAM__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.DIAGRAM__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.DIAGRAM__TYPE:
+			return getType();
+		case NotationPackage.DIAGRAM__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.DIAGRAM__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.DIAGRAM__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.DIAGRAM__STYLES:
+			return getStyles();
+		case NotationPackage.DIAGRAM__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.DIAGRAM__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.DIAGRAM__NAME:
+			return getName();
+		case NotationPackage.DIAGRAM__MEASUREMENT_UNIT:
+			return getMeasurementUnit();
+		case NotationPackage.DIAGRAM__PERSISTED_EDGES:
+			return getPersistedEdges();
+		case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
+			return getTransientEdges();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.DIAGRAM__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.DIAGRAM__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.DIAGRAM__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.DIAGRAM__MEASUREMENT_UNIT:
-				setMeasurementUnit((MeasurementUnit)newValue);
-				return;
-			case NotationPackage.DIAGRAM__PERSISTED_EDGES:
-				getPersistedEdges().clear();
-				getPersistedEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
-				getTransientEdges().clear();
-				getTransientEdges().addAll((Collection)newValue);
-				return;
+		case NotationPackage.DIAGRAM__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.DIAGRAM__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.DIAGRAM__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.DIAGRAM__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.DIAGRAM__MEASUREMENT_UNIT:
+			setMeasurementUnit((MeasurementUnit) newValue);
+			return;
+		case NotationPackage.DIAGRAM__PERSISTED_EDGES:
+			getPersistedEdges().clear();
+			getPersistedEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
+			getTransientEdges().clear();
+			getTransientEdges().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.DIAGRAM__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.DIAGRAM__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.DIAGRAM__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.DIAGRAM__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.DIAGRAM__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.DIAGRAM__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.DIAGRAM__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.DIAGRAM__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.DIAGRAM__MEASUREMENT_UNIT:
-				unsetMeasurementUnit();
-				return;
-			case NotationPackage.DIAGRAM__PERSISTED_EDGES:
-				getPersistedEdges().clear();
-				return;
-			case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
-				getTransientEdges().clear();
-				return;
+		case NotationPackage.DIAGRAM__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.DIAGRAM__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.DIAGRAM__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.DIAGRAM__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.DIAGRAM__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.DIAGRAM__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.DIAGRAM__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.DIAGRAM__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.DIAGRAM__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.DIAGRAM__MEASUREMENT_UNIT:
+			unsetMeasurementUnit();
+			return;
+		case NotationPackage.DIAGRAM__PERSISTED_EDGES:
+			getPersistedEdges().clear();
+			return;
+		case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
+			getTransientEdges().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.DIAGRAM__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.DIAGRAM__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.DIAGRAM__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.DIAGRAM__SOURCE_EDGES:
-				return sourceEdges != null && !sourceEdges.isEmpty();
-			case NotationPackage.DIAGRAM__TARGET_EDGES:
-				return targetEdges != null && !targetEdges.isEmpty();
-			case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.DIAGRAM__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.DIAGRAM__ELEMENT:
-				return isSetElement();
-			case NotationPackage.DIAGRAM__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.DIAGRAM__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.DIAGRAM__MEASUREMENT_UNIT:
-				return isSetMeasurementUnit();
-			case NotationPackage.DIAGRAM__PERSISTED_EDGES:
-				return persistedEdges != null && !persistedEdges.isEmpty();
-			case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
-				return transientEdges != null && !transientEdges.isEmpty();
+		case NotationPackage.DIAGRAM__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.DIAGRAM__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.DIAGRAM__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.DIAGRAM__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.DIAGRAM__SOURCE_EDGES:
+			return sourceEdges != null && !sourceEdges.isEmpty();
+		case NotationPackage.DIAGRAM__TARGET_EDGES:
+			return targetEdges != null && !targetEdges.isEmpty();
+		case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.DIAGRAM__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.DIAGRAM__ELEMENT:
+			return isSetElement();
+		case NotationPackage.DIAGRAM__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.DIAGRAM__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.DIAGRAM__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.DIAGRAM__MEASUREMENT_UNIT:
+			return isSetMeasurementUnit();
+		case NotationPackage.DIAGRAM__PERSISTED_EDGES:
+			return persistedEdges != null && !persistedEdges.isEmpty();
+		case NotationPackage.DIAGRAM__TRANSIENT_EDGES:
+			return transientEdges != null && !transientEdges.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public String toString() {
-		if (eIsProxy()) return super.toString();
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(", measurementUnit: "); //$NON-NLS-1$
-		if ((eFlags & MEASUREMENT_UNIT_ESETFLAG) != 0) result.append(MEASUREMENT_UNIT_EFLAG_VALUES[(eFlags & MEASUREMENT_UNIT_EFLAG) >>> MEASUREMENT_UNIT_EFLAG_OFFSET]); else result.append("<unset>"); //$NON-NLS-1$
+		if ((eFlags & MEASUREMENT_UNIT_ESETFLAG) != 0)
+			result.append(
+					MEASUREMENT_UNIT_EFLAG_VALUES[(eFlags & MEASUREMENT_UNIT_EFLAG) >>> MEASUREMENT_UNIT_EFLAG_OFFSET]);
+		else
+			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
 		return result.toString();
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertEdge(Edge edge) {
-        persistEdges();
-        getPersistedEdges().add(edge);
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertEdge(Edge edge) {
+		persistEdges();
+		getPersistedEdges().add(edge);
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertEdgeAt(Edge edge, int index) {
-        persistEdges();
-        if (getPersistedEdges().size() >= index) {
-            getPersistedEdges().add(index, edge);
-        }
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertEdgeAt(Edge edge, int index) {
+		persistEdges();
+		if (getPersistedEdges().size() >= index) {
+			getPersistedEdges().add(index, edge);
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertEdge(Edge edge, boolean persisted) {
-        List edges = null;
-        if (persisted)
-            edges = getPersistedEdges();
-        else
-            edges = getTransientEdges();
-        edges.add(edge);
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertEdge(Edge edge, boolean persisted) {
+		List edges = null;
+		if (persisted)
+			edges = getPersistedEdges();
+		else
+			edges = getTransientEdges();
+		edges.add(edge);
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void persistEdges() {
-        if (eIsSet(NotationPackage.DIAGRAM__TRANSIENT_EDGES)) {
-            List edges = new ArrayList(getTransientEdges());
-            getPersistedEdges().addAll(edges);
-            for (Iterator iterator = edges.iterator(); iterator.hasNext();) {
-                Edge edge = (Edge) iterator.next();
-                View sourceView = edge.getSource();
-                View targetView = edge.getTarget();
-                if (sourceView != null)
-                    persistCompleteHierarchy(sourceView);
-                if (targetView != null)
-                    persistCompleteHierarchy(targetView);
-            }
-        }
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void persistEdges() {
+		if (eIsSet(NotationPackage.DIAGRAM__TRANSIENT_EDGES)) {
+			List edges = new ArrayList(getTransientEdges());
+			getPersistedEdges().addAll(edges);
+			for (Iterator iterator = edges.iterator(); iterator.hasNext();) {
+				Edge edge = (Edge) iterator.next();
+				View sourceView = edge.getSource();
+				View targetView = edge.getTarget();
+				if (sourceView != null)
+					persistCompleteHierarchy(sourceView);
+				if (targetView != null)
+					persistCompleteHierarchy(targetView);
+			}
+		}
+	}
 
-    /**
-     * Persist the view passed in and all its parent views if they are
-     * transient.
-     * 
-     * @param view
-     *            the view to persist
-     */
-    private void persistCompleteHierarchy(View view) {
-        view.persist();
-        EObject container = view.eContainer();
-        while (container instanceof View) {
-            // if already persisted, quit
-            EStructuralFeature sFeature = container.eContainingFeature();
-            if (sFeature != null && !sFeature.isTransient()) {
-                break;
-            }
+	/**
+	 * Persist the view passed in and all its parent views if they are transient.
+	 * 
+	 * @param view the view to persist
+	 */
+	private void persistCompleteHierarchy(View view) {
+		view.persist();
+		EObject container = view.eContainer();
+		while (container instanceof View) {
+			// if already persisted, quit
+			EStructuralFeature sFeature = container.eContainingFeature();
+			if (sFeature != null && !sFeature.isTransient()) {
+				break;
+			}
 
-            ((View) container).persist();
-            container = container.eContainer();
-        }
-    }
+			((View) container).persist();
+			container = container.eContainer();
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void removeEdge(Edge edge) {
-    	if (edge.eContainer() == this) {
-	        EStructuralFeature eContainingFeature = edge.eContainingFeature();
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void removeEdge(Edge edge) {
+		if (edge.eContainer() == this) {
+			EStructuralFeature eContainingFeature = edge.eContainingFeature();
 			if (eContainingFeature == NotationPackage.Literals.DIAGRAM__TRANSIENT_EDGES) {
-	        	getTransientEdges().remove(edge);
-	        } else if (eContainingFeature == NotationPackage.Literals.DIAGRAM__PERSISTED_EDGES) {
-	        	getPersistedEdges().remove(edge);
-	        }
-    	}
-    }
+				getTransientEdges().remove(edge);
+			} else if (eContainingFeature == NotationPackage.Literals.DIAGRAM__PERSISTED_EDGES) {
+				getPersistedEdges().remove(edge);
+			}
+		}
+	}
 
 } // DiagramImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramLinkStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramLinkStyleImpl.java
index 29e9c69..5b904b6 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramLinkStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramLinkStyleImpl.java
@@ -21,23 +21,23 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diagram Link Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Diagram
+ * Link Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl#getDiagramLink <em>Diagram Link</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl#getDiagramLink
+ * <em>Diagram Link</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class DiagramLinkStyleImpl extends MinimalEObjectImpl.Container implements DiagramLinkStyle {
 	/**
-	 * The cached value of the '{@link #getDiagramLink() <em>Diagram Link</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDiagramLink() <em>Diagram Link</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDiagramLink()
 	 * @generated
 	 * @ordered
@@ -45,8 +45,8 @@
 	protected Diagram diagramLink;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DiagramLinkStyleImpl() {
@@ -54,8 +54,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -63,25 +63,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Diagram getDiagramLink() {
 		if (diagramLink != null && diagramLink.eIsProxy()) {
-			InternalEObject oldDiagramLink = (InternalEObject)diagramLink;
-			diagramLink = (Diagram)eResolveProxy(oldDiagramLink);
+			InternalEObject oldDiagramLink = (InternalEObject) diagramLink;
+			diagramLink = (Diagram) eResolveProxy(oldDiagramLink);
 			if (diagramLink != oldDiagramLink) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK, oldDiagramLink, diagramLink));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK, oldDiagramLink, diagramLink));
 			}
 		}
 		return diagramLink;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Diagram basicGetDiagramLink() {
@@ -89,70 +90,72 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDiagramLink(Diagram newDiagramLink) {
 		Diagram oldDiagramLink = diagramLink;
 		diagramLink = newDiagramLink;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK, oldDiagramLink, diagramLink));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK,
+					oldDiagramLink, diagramLink));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
-				if (resolve) return getDiagramLink();
-				return basicGetDiagramLink();
+		case NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
+			if (resolve)
+				return getDiagramLink();
+			return basicGetDiagramLink();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
-				setDiagramLink((Diagram)newValue);
-				return;
+		case NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
+			setDiagramLink((Diagram) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
-				setDiagramLink((Diagram)null);
-				return;
+		case NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
+			setDiagramLink((Diagram) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
-				return diagramLink != null;
+		case NotationPackage.DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
+			return diagramLink != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //DiagramLinkStyleImpl
+} // DiagramLinkStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramStyleImpl.java
index 01948ba..4a7cc1f 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramStyleImpl.java
@@ -29,17 +29,19 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diagram Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Diagram
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl#getHorizontalGuides <em>Horizontal Guides</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl#getVerticalGuides <em>Vertical Guides</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl#getDescription <em>Description</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl#getHorizontalGuides
+ * <em>Horizontal Guides</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl#getVerticalGuides
+ * <em>Vertical Guides</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl#getDescription
+ * <em>Description</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -47,292 +49,308 @@
  * @canBeSeenBy %partners
  */
 public class DiagramStyleImpl extends PageStyleImpl implements DiagramStyle {
-	
+
 	/**
-	 * The cached value of the '{@link #getHorizontalGuides() <em>Horizontal Guides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHorizontalGuides() <em>Horizontal
+	 * Guides</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHorizontalGuides()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList horizontalGuides;
 
-    /**
-	 * The cached value of the '{@link #getVerticalGuides() <em>Vertical Guides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getVerticalGuides() <em>Vertical
+	 * Guides</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getVerticalGuides()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList verticalGuides;
 
-    /**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final String DESCRIPTION_EDEFAULT = ""; //$NON-NLS-1$
 
-    /**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
 	 */
 	protected String description = DESCRIPTION_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DiagramStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.DIAGRAM_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getHorizontalGuides() {
 		if (horizontalGuides == null) {
-			horizontalGuides = new EObjectContainmentEList(Guide.class, this, NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES);
+			horizontalGuides = new EObjectContainmentEList(Guide.class, this,
+					NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES);
 		}
 		return horizontalGuides;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getVerticalGuides() {
 		if (verticalGuides == null) {
-			verticalGuides = new EObjectContainmentEList(Guide.class, this, NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES);
+			verticalGuides = new EObjectContainmentEList(Guide.class, this,
+					NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES);
 		}
 		return verticalGuides;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDescription() {
 		return description;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDescription(String newDescription) {
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DIAGRAM_STYLE__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DIAGRAM_STYLE__DESCRIPTION,
+					oldDescription, description));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
-				return ((InternalEList)getHorizontalGuides()).basicRemove(otherEnd, msgs);
-			case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
-				return ((InternalEList)getVerticalGuides()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
+			return ((InternalEList) getHorizontalGuides()).basicRemove(otherEnd, msgs);
+		case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
+			return ((InternalEList) getVerticalGuides()).basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_STYLE__PAGE_X:
-				return new Integer(getPageX());
-			case NotationPackage.DIAGRAM_STYLE__PAGE_Y:
-				return new Integer(getPageY());
-			case NotationPackage.DIAGRAM_STYLE__PAGE_WIDTH:
-				return new Integer(getPageWidth());
-			case NotationPackage.DIAGRAM_STYLE__PAGE_HEIGHT:
-				return new Integer(getPageHeight());
-			case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
-				return getHorizontalGuides();
-			case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
-				return getVerticalGuides();
-			case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
-				return getDescription();
+		case NotationPackage.DIAGRAM_STYLE__PAGE_X:
+			return new Integer(getPageX());
+		case NotationPackage.DIAGRAM_STYLE__PAGE_Y:
+			return new Integer(getPageY());
+		case NotationPackage.DIAGRAM_STYLE__PAGE_WIDTH:
+			return new Integer(getPageWidth());
+		case NotationPackage.DIAGRAM_STYLE__PAGE_HEIGHT:
+			return new Integer(getPageHeight());
+		case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
+			return getHorizontalGuides();
+		case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
+			return getVerticalGuides();
+		case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
+			return getDescription();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_STYLE__PAGE_X:
-				setPageX(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_Y:
-				setPageY(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_WIDTH:
-				setPageWidth(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_HEIGHT:
-				setPageHeight(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
-				getHorizontalGuides().clear();
-				getHorizontalGuides().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
-				getVerticalGuides().clear();
-				getVerticalGuides().addAll((Collection)newValue);
-				return;
-			case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_X:
+			setPageX(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_Y:
+			setPageY(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_WIDTH:
+			setPageWidth(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_HEIGHT:
+			setPageHeight(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
+			getHorizontalGuides().clear();
+			getHorizontalGuides().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
+			getVerticalGuides().clear();
+			getVerticalGuides().addAll((Collection) newValue);
+			return;
+		case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_STYLE__PAGE_X:
-				setPageX(PAGE_X_EDEFAULT);
-				return;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_Y:
-				setPageY(PAGE_Y_EDEFAULT);
-				return;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_WIDTH:
-				setPageWidth(PAGE_WIDTH_EDEFAULT);
-				return;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_HEIGHT:
-				setPageHeight(PAGE_HEIGHT_EDEFAULT);
-				return;
-			case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
-				getHorizontalGuides().clear();
-				return;
-			case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
-				getVerticalGuides().clear();
-				return;
-			case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_X:
+			setPageX(PAGE_X_EDEFAULT);
+			return;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_Y:
+			setPageY(PAGE_Y_EDEFAULT);
+			return;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_WIDTH:
+			setPageWidth(PAGE_WIDTH_EDEFAULT);
+			return;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_HEIGHT:
+			setPageHeight(PAGE_HEIGHT_EDEFAULT);
+			return;
+		case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
+			getHorizontalGuides().clear();
+			return;
+		case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
+			getVerticalGuides().clear();
+			return;
+		case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DIAGRAM_STYLE__PAGE_X:
-				return pageX != PAGE_X_EDEFAULT;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_Y:
-				return pageY != PAGE_Y_EDEFAULT;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_WIDTH:
-				return pageWidth != PAGE_WIDTH_EDEFAULT;
-			case NotationPackage.DIAGRAM_STYLE__PAGE_HEIGHT:
-				return pageHeight != PAGE_HEIGHT_EDEFAULT;
-			case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
-				return horizontalGuides != null && !horizontalGuides.isEmpty();
-			case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
-				return verticalGuides != null && !verticalGuides.isEmpty();
-			case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case NotationPackage.DIAGRAM_STYLE__PAGE_X:
+			return pageX != PAGE_X_EDEFAULT;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_Y:
+			return pageY != PAGE_Y_EDEFAULT;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_WIDTH:
+			return pageWidth != PAGE_WIDTH_EDEFAULT;
+		case NotationPackage.DIAGRAM_STYLE__PAGE_HEIGHT:
+			return pageHeight != PAGE_HEIGHT_EDEFAULT;
+		case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
+			return horizontalGuides != null && !horizontalGuides.isEmpty();
+		case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
+			return verticalGuides != null && !verticalGuides.isEmpty();
+		case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == GuideStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES: return NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES;
-				case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES: return NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES;
-				default: return -1;
+			case NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES:
+				return NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES;
+			case NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES:
+				return NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DescriptionStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.DIAGRAM_STYLE__DESCRIPTION: return NotationPackage.DESCRIPTION_STYLE__DESCRIPTION;
-				default: return -1;
+			case NotationPackage.DIAGRAM_STYLE__DESCRIPTION:
+				return NotationPackage.DESCRIPTION_STYLE__DESCRIPTION;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == GuideStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES: return NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES;
-				case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES: return NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES;
-				default: return -1;
+			case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
+				return NotationPackage.DIAGRAM_STYLE__HORIZONTAL_GUIDES;
+			case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
+				return NotationPackage.DIAGRAM_STYLE__VERTICAL_GUIDES;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DescriptionStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION: return NotationPackage.DIAGRAM_STYLE__DESCRIPTION;
-				default: return -1;
+			case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
+				return NotationPackage.DIAGRAM_STYLE__DESCRIPTION;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (description: "); //$NON-NLS-1$
@@ -341,4 +359,4 @@
 		return result.toString();
 	}
 
-} //DiagramStyleImpl
+} // DiagramStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DoubleListValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DoubleListValueStyleImpl.java
index debe9d4..74e7d1e 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DoubleListValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DoubleListValueStyleImpl.java
@@ -20,31 +20,32 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Double List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Double
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl#getDoubleListValue <em>Double List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl#getDoubleListValue
+ * <em>Double List Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleListValueStyle {
 	/**
-	 * The cached value of the '{@link #getDoubleListValue() <em>Double List Value</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDoubleListValue() <em>Double List
+	 * Value</em>}' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDoubleListValue()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList doubleListValue;
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DoubleListValueStyleImpl() {
@@ -52,8 +53,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -61,89 +62,91 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getDoubleListValue() {
 		if (doubleListValue == null) {
-			doubleListValue = new EDataTypeEList(Double.class, this, NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);
+			doubleListValue = new EDataTypeEList(Double.class, this,
+					NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);
 		}
 		return doubleListValue;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
-				return getDoubleListValue();
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+			return getDoubleListValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
-				getDoubleListValue().clear();
-				getDoubleListValue().addAll((Collection)newValue);
-				return;
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+			getDoubleListValue().clear();
+			getDoubleListValue().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
-				getDoubleListValue().clear();
-				return;
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+			getDoubleListValue().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
-				return doubleListValue != null && !doubleListValue.isEmpty();
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+			return doubleListValue != null && !doubleListValue.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (doubleListValue: "); //$NON-NLS-1$
@@ -152,4 +155,4 @@
 		return result.toString();
 	}
 
-} //DoubleListValueStyleImpl
+} // DoubleListValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DoubleValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DoubleValueStyleImpl.java
index b907262..b41e434 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DoubleValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DoubleValueStyleImpl.java
@@ -12,32 +12,29 @@
 package org.eclipse.gmf.runtime.notation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.DoubleValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Double Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Double
+ * Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl#getDoubleValue <em>Double Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl#getDoubleValue
+ * <em>Double Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueStyle {
 	/**
-	 * The default value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getDoubleValue() <em>Double Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDoubleValue()
 	 * @generated
 	 * @ordered
@@ -45,9 +42,9 @@
 	protected static final double DOUBLE_VALUE_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDoubleValue() <em>Double Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDoubleValue()
 	 * @generated
 	 * @ordered
@@ -55,8 +52,8 @@
 	protected double doubleValue = DOUBLE_VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DoubleValueStyleImpl() {
@@ -64,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -73,8 +70,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getDoubleValue() {
@@ -82,88 +79,90 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDoubleValue(double newDoubleValue) {
 		double oldDoubleValue = doubleValue;
 		doubleValue = newDoubleValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE, oldDoubleValue, doubleValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE,
+					oldDoubleValue, doubleValue));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DOUBLE_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
-				return new Double(getDoubleValue());
+		case NotationPackage.DOUBLE_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+			return new Double(getDoubleValue());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DOUBLE_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
-				setDoubleValue(((Double)newValue).doubleValue());
-				return;
+		case NotationPackage.DOUBLE_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+			setDoubleValue(((Double) newValue).doubleValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DOUBLE_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
-				setDoubleValue(DOUBLE_VALUE_EDEFAULT);
-				return;
+		case NotationPackage.DOUBLE_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+			setDoubleValue(DOUBLE_VALUE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DOUBLE_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
-				return doubleValue != DOUBLE_VALUE_EDEFAULT;
+		case NotationPackage.DOUBLE_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+			return doubleValue != DOUBLE_VALUE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (doubleValue: "); //$NON-NLS-1$
@@ -172,4 +171,4 @@
 		return result.toString();
 	}
 
-} //DoubleValueStyleImpl
+} // DoubleValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DrawerStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DrawerStyleImpl.java
index 497bf7f..77abca6 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DrawerStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DrawerStyleImpl.java
@@ -20,15 +20,15 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Drawer Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Drawer
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl#isCollapsed <em>Collapsed</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl#isCollapsed
+ * <em>Collapsed</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -36,133 +36,139 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class DrawerStyleImpl extends MinimalEObjectImpl.Container implements DrawerStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
-    /**
-	 * The default value of the '{@link #isCollapsed() <em>Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * The default value of the '{@link #isCollapsed() <em>Collapsed</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCollapsed()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean COLLAPSED_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isCollapsed() <em>Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isCollapsed()
+	 * <em>Collapsed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isCollapsed()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int COLLAPSED_EFLAG = 1 << 8;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DrawerStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.DRAWER_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isCollapsed() {
 		return (eFlags & COLLAPSED_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCollapsed(boolean newCollapsed) {
 		boolean oldCollapsed = (eFlags & COLLAPSED_EFLAG) != 0;
-		if (newCollapsed) eFlags |= COLLAPSED_EFLAG; else eFlags &= ~COLLAPSED_EFLAG;
+		if (newCollapsed)
+			eFlags |= COLLAPSED_EFLAG;
+		else
+			eFlags &= ~COLLAPSED_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DRAWER_STYLE__COLLAPSED, oldCollapsed, newCollapsed));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DRAWER_STYLE__COLLAPSED, oldCollapsed,
+					newCollapsed));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.DRAWER_STYLE__COLLAPSED:
-				return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.DRAWER_STYLE__COLLAPSED:
+			return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.DRAWER_STYLE__COLLAPSED:
-				setCollapsed(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.DRAWER_STYLE__COLLAPSED:
+			setCollapsed(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DRAWER_STYLE__COLLAPSED:
-				setCollapsed(COLLAPSED_EDEFAULT);
-				return;
+		case NotationPackage.DRAWER_STYLE__COLLAPSED:
+			setCollapsed(COLLAPSED_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.DRAWER_STYLE__COLLAPSED:
-				return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
+		case NotationPackage.DRAWER_STYLE__COLLAPSED:
+			return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (collapsed: "); //$NON-NLS-1$
@@ -171,4 +177,4 @@
 		return result.toString();
 	}
 
-} //DrawerStyleImpl
+} // DrawerStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EObjectListValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EObjectListValueStyleImpl.java
index 71b6bcd..0c765f6 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EObjectListValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EObjectListValueStyleImpl.java
@@ -14,33 +14,30 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.gmf.runtime.notation.EObjectListValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EObject List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl#getEObjectListValue <em>EObject List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl#getEObjectListValue
+ * <em>EObject List Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObjectListValueStyle {
 	/**
-	 * The cached value of the '{@link #getEObjectListValue() <em>EObject List Value</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getEObjectListValue() <em>EObject List
+	 * Value</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEObjectListValue()
 	 * @generated
 	 * @ordered
@@ -48,8 +45,8 @@
 	protected EList eObjectListValue;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EObjectListValueStyleImpl() {
@@ -57,8 +54,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -66,80 +63,81 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getEObjectListValue() {
 		if (eObjectListValue == null) {
-			eObjectListValue = new EObjectResolvingEList(EObject.class, this, NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE);
+			eObjectListValue = new EObjectResolvingEList(EObject.class, this,
+					NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE);
 		}
 		return eObjectListValue;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE:
-				return getEObjectListValue();
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE:
+			return getEObjectListValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE:
-				getEObjectListValue().clear();
-				getEObjectListValue().addAll((Collection)newValue);
-				return;
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE:
+			getEObjectListValue().clear();
+			getEObjectListValue().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE:
-				getEObjectListValue().clear();
-				return;
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE:
+			getEObjectListValue().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE:
-				return eObjectListValue != null && !eObjectListValue.isEmpty();
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_LIST_VALUE:
+			return eObjectListValue != null && !eObjectListValue.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //EObjectListValueStyleImpl
+} // EObjectListValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EObjectValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EObjectValueStyleImpl.java
index 0ba2320..53c6f9f 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EObjectValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EObjectValueStyleImpl.java
@@ -12,34 +12,31 @@
 package org.eclipse.gmf.runtime.notation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.EObjectValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EObject Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject
+ * Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl#getEObjectValue <em>EObject Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl#getEObjectValue
+ * <em>EObject Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValueStyle {
 	/**
-	 * The cached value of the '{@link #getEObjectValue() <em>EObject Value</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getEObjectValue() <em>EObject Value</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEObjectValue()
 	 * @generated
 	 * @ordered
@@ -47,8 +44,8 @@
 	protected EObject eObjectValue;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EObjectValueStyleImpl() {
@@ -56,8 +53,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -65,25 +62,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EObject getEObjectValue() {
 		if (eObjectValue != null && eObjectValue.eIsProxy()) {
-			InternalEObject oldEObjectValue = (InternalEObject)eObjectValue;
+			InternalEObject oldEObjectValue = (InternalEObject) eObjectValue;
 			eObjectValue = eResolveProxy(oldEObjectValue);
 			if (eObjectValue != oldEObjectValue) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE, oldEObjectValue, eObjectValue));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE, oldEObjectValue, eObjectValue));
 			}
 		}
 		return eObjectValue;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EObject basicGetEObjectValue() {
@@ -91,80 +89,82 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEObjectValue(EObject newEObjectValue) {
 		EObject oldEObjectValue = eObjectValue;
 		eObjectValue = newEObjectValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE, oldEObjectValue, eObjectValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE,
+					oldEObjectValue, eObjectValue));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.EOBJECT_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
-				if (resolve) return getEObjectValue();
-				return basicGetEObjectValue();
+		case NotationPackage.EOBJECT_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+			if (resolve)
+				return getEObjectValue();
+			return basicGetEObjectValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.EOBJECT_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
-				setEObjectValue((EObject)newValue);
-				return;
+		case NotationPackage.EOBJECT_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+			setEObjectValue((EObject) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.EOBJECT_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
-				setEObjectValue((EObject)null);
-				return;
+		case NotationPackage.EOBJECT_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+			setEObjectValue((EObject) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.EOBJECT_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
-				return eObjectValue != null;
+		case NotationPackage.EOBJECT_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+			return eObjectValue != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //EObjectValueStyleImpl
+} // EObjectValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EdgeImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EdgeImpl.java
index 0e5c3f9..34fe938 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EdgeImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/EdgeImpl.java
@@ -28,19 +28,23 @@
 import org.eclipse.gmf.runtime.notation.View;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Edge</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Edge</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getBendpoints <em>Bendpoints</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getSourceAnchor <em>Source Anchor</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getTargetAnchor <em>Target Anchor</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getSource
+ * <em>Source</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getTarget
+ * <em>Target</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getBendpoints
+ * <em>Bendpoints</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getSourceAnchor
+ * <em>Source Anchor</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.EdgeImpl#getTargetAnchor
+ * <em>Target Anchor</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -48,328 +52,363 @@
  * @canBeSeenBy %partners
  */
 public class EdgeImpl extends ViewImpl implements Edge {
-    /**
+	/**
 	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
 	 */
 	protected View source;
 
-				/**
+	/**
 	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTarget()
 	 * @generated
 	 * @ordered
 	 */
 	protected View target;
 
-				/**
-	 * The cached value of the '{@link #getBendpoints() <em>Bendpoints</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getBendpoints() <em>Bendpoints</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBendpoints()
 	 * @generated
 	 * @ordered
 	 */
 	protected Bendpoints bendpoints;
 
-				/**
-	 * The cached value of the '{@link #getSourceAnchor() <em>Source Anchor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getSourceAnchor() <em>Source Anchor</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceAnchor()
 	 * @generated
 	 * @ordered
 	 */
 	protected Anchor sourceAnchor;
 
-				/**
-	 * The cached value of the '{@link #getTargetAnchor() <em>Target Anchor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getTargetAnchor() <em>Target Anchor</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetAnchor()
 	 * @generated
 	 * @ordered
 	 */
 	protected Anchor targetAnchor;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EdgeImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.EDGE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public View getSource() {
 		return source;
 	}
 
-    /**
-     * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-      * @generated NOT
-     */
-	public NotificationChain basicSetSource(View newSource, NotificationChain msgs) {
-        if (eContainingFeature() == NotationPackage.eINSTANCE.getDiagram_PersistedEdges()){
-            if (newSource!=null && newSource.eContainingFeature() == NotationPackage.eINSTANCE.getView_TransientChildren()){
-                EObject container = newSource.eContainer();
-                if (container!=null && container instanceof View){
-                    View parent = (View)container;
-                    parent.persistChildren();
-                }
-            }
-        }
-        return basicSetSourceGen(newSource, msgs);
-    }
-	
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public NotificationChain basicSetSource(View newSource, NotificationChain msgs) {
+		if (eContainingFeature() == NotationPackage.eINSTANCE.getDiagram_PersistedEdges()) {
+			if (newSource != null
+					&& newSource.eContainingFeature() == NotationPackage.eINSTANCE.getView_TransientChildren()) {
+				EObject container = newSource.eContainer();
+				if (container != null && container instanceof View) {
+					View parent = (View) container;
+					parent.persistChildren();
+				}
+			}
+		}
+		return basicSetSourceGen(newSource, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetSourceGen(View newSource, NotificationChain msgs) {
 		View oldSource = source;
 		source = newSource;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__SOURCE, oldSource, newSource);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__SOURCE,
+					oldSource, newSource);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
-	
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSource(View newSource) {
 		if (newSource != source) {
 			NotificationChain msgs = null;
 			if (source != null)
-				msgs = ((InternalEObject)source).eInverseRemove(this, NotationPackage.VIEW__SOURCE_EDGES, View.class, msgs);
+				msgs = ((InternalEObject) source).eInverseRemove(this, NotationPackage.VIEW__SOURCE_EDGES, View.class,
+						msgs);
 			if (newSource != null)
-				msgs = ((InternalEObject)newSource).eInverseAdd(this, NotationPackage.VIEW__SOURCE_EDGES, View.class, msgs);
+				msgs = ((InternalEObject) newSource).eInverseAdd(this, NotationPackage.VIEW__SOURCE_EDGES, View.class,
+						msgs);
 			msgs = basicSetSource(newSource, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__SOURCE, newSource, newSource));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public View getTarget() {
 		return target;
 	}
 
-    /**
-     * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-     * @generated NOT
-     */
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
 	public NotificationChain basicSetTarget(View newTarget, NotificationChain msgs) {
-        if (eContainingFeature() == NotationPackage.eINSTANCE.getDiagram_PersistedEdges()){
-            if (newTarget!=null && newTarget.eContainingFeature() == NotationPackage.eINSTANCE.getView_TransientChildren()){
-                EObject container = newTarget.eContainer();
-                if (container!=null && container instanceof View){
-                    View parent = (View)container;
-                    parent.persistChildren();
-                }
-            }
-        }
-        return basicSetTargetGen(newTarget, msgs);
-    }
+		if (eContainingFeature() == NotationPackage.eINSTANCE.getDiagram_PersistedEdges()) {
+			if (newTarget != null
+					&& newTarget.eContainingFeature() == NotationPackage.eINSTANCE.getView_TransientChildren()) {
+				EObject container = newTarget.eContainer();
+				if (container != null && container instanceof View) {
+					View parent = (View) container;
+					parent.persistChildren();
+				}
+			}
+		}
+		return basicSetTargetGen(newTarget, msgs);
+	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTargetGen(View newTarget, NotificationChain msgs) {
 		View oldTarget = target;
 		target = newTarget;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__TARGET, oldTarget, newTarget);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__TARGET,
+					oldTarget, newTarget);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
-	
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTarget(View newTarget) {
 		if (newTarget != target) {
 			NotificationChain msgs = null;
 			if (target != null)
-				msgs = ((InternalEObject)target).eInverseRemove(this, NotationPackage.VIEW__TARGET_EDGES, View.class, msgs);
+				msgs = ((InternalEObject) target).eInverseRemove(this, NotationPackage.VIEW__TARGET_EDGES, View.class,
+						msgs);
 			if (newTarget != null)
-				msgs = ((InternalEObject)newTarget).eInverseAdd(this, NotationPackage.VIEW__TARGET_EDGES, View.class, msgs);
+				msgs = ((InternalEObject) newTarget).eInverseAdd(this, NotationPackage.VIEW__TARGET_EDGES, View.class,
+						msgs);
 			msgs = basicSetTarget(newTarget, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__TARGET, newTarget, newTarget));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bendpoints getBendpoints() {
 		return bendpoints;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBendpoints(Bendpoints newBendpoints, NotificationChain msgs) {
 		Bendpoints oldBendpoints = bendpoints;
 		bendpoints = newBendpoints;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__BENDPOINTS, oldBendpoints, newBendpoints);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.EDGE__BENDPOINTS, oldBendpoints, newBendpoints);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBendpoints(Bendpoints newBendpoints) {
 		if (newBendpoints != bendpoints) {
 			NotificationChain msgs = null;
 			if (bendpoints != null)
-				msgs = ((InternalEObject)bendpoints).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__BENDPOINTS, null, msgs);
+				msgs = ((InternalEObject) bendpoints).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__BENDPOINTS, null, msgs);
 			if (newBendpoints != null)
-				msgs = ((InternalEObject)newBendpoints).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__BENDPOINTS, null, msgs);
+				msgs = ((InternalEObject) newBendpoints).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__BENDPOINTS, null, msgs);
 			msgs = basicSetBendpoints(newBendpoints, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__BENDPOINTS, newBendpoints, newBendpoints));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__BENDPOINTS, newBendpoints,
+					newBendpoints));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Anchor getSourceAnchor() {
 		return sourceAnchor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetSourceAnchor(Anchor newSourceAnchor, NotificationChain msgs) {
 		Anchor oldSourceAnchor = sourceAnchor;
 		sourceAnchor = newSourceAnchor;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__SOURCE_ANCHOR, oldSourceAnchor, newSourceAnchor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.EDGE__SOURCE_ANCHOR, oldSourceAnchor, newSourceAnchor);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSourceAnchor(Anchor newSourceAnchor) {
 		if (newSourceAnchor != sourceAnchor) {
 			NotificationChain msgs = null;
 			if (sourceAnchor != null)
-				msgs = ((InternalEObject)sourceAnchor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__SOURCE_ANCHOR, null, msgs);
+				msgs = ((InternalEObject) sourceAnchor).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__SOURCE_ANCHOR, null, msgs);
 			if (newSourceAnchor != null)
-				msgs = ((InternalEObject)newSourceAnchor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__SOURCE_ANCHOR, null, msgs);
+				msgs = ((InternalEObject) newSourceAnchor).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__SOURCE_ANCHOR, null, msgs);
 			msgs = basicSetSourceAnchor(newSourceAnchor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__SOURCE_ANCHOR, newSourceAnchor, newSourceAnchor));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__SOURCE_ANCHOR, newSourceAnchor,
+					newSourceAnchor));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Anchor getTargetAnchor() {
 		return targetAnchor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTargetAnchor(Anchor newTargetAnchor, NotificationChain msgs) {
 		Anchor oldTargetAnchor = targetAnchor;
 		targetAnchor = newTargetAnchor;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__TARGET_ANCHOR, oldTargetAnchor, newTargetAnchor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.EDGE__TARGET_ANCHOR, oldTargetAnchor, newTargetAnchor);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetAnchor(Anchor newTargetAnchor) {
 		if (newTargetAnchor != targetAnchor) {
 			NotificationChain msgs = null;
 			if (targetAnchor != null)
-				msgs = ((InternalEObject)targetAnchor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__TARGET_ANCHOR, null, msgs);
+				msgs = ((InternalEObject) targetAnchor).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__TARGET_ANCHOR, null, msgs);
 			if (newTargetAnchor != null)
-				msgs = ((InternalEObject)newTargetAnchor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__TARGET_ANCHOR, null, msgs);
+				msgs = ((InternalEObject) newTargetAnchor).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.EDGE__TARGET_ANCHOR, null, msgs);
 			msgs = basicSetTargetAnchor(newTargetAnchor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__TARGET_ANCHOR, newTargetAnchor, newTargetAnchor));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.EDGE__TARGET_ANCHOR, newTargetAnchor,
+					newTargetAnchor));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public Bendpoints createBendpoints(EClass eClass) {
@@ -379,8 +418,7 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 */
 	public Anchor createSourceAnchor(EClass eClass) {
 		Anchor newAnchor = (Anchor) eClass.getEPackage().getEFactoryInstance().create(eClass);
@@ -389,8 +427,7 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 */
 	public Anchor createTargetAnchor(EClass eClass) {
 		Anchor newAnchor = (Anchor) eClass.getEPackage().getEFactoryInstance().create(eClass);
@@ -398,268 +435,272 @@
 		return newAnchor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.EDGE__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-			case NotationPackage.EDGE__SOURCE_EDGES:
-				return ((InternalEList)getSourceEdges()).basicAdd(otherEnd, msgs);
-			case NotationPackage.EDGE__TARGET_EDGES:
-				return ((InternalEList)getTargetEdges()).basicAdd(otherEnd, msgs);
-			case NotationPackage.EDGE__SOURCE:
-				if (source != null)
-					msgs = ((InternalEObject)source).eInverseRemove(this, NotationPackage.VIEW__SOURCE_EDGES, View.class, msgs);
-				return basicSetSource((View)otherEnd, msgs);
-			case NotationPackage.EDGE__TARGET:
-				if (target != null)
-					msgs = ((InternalEObject)target).eInverseRemove(this, NotationPackage.VIEW__TARGET_EDGES, View.class, msgs);
-				return basicSetTarget((View)otherEnd, msgs);
+		case NotationPackage.EDGE__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicAdd(otherEnd, msgs);
+		case NotationPackage.EDGE__SOURCE_EDGES:
+			return ((InternalEList) getSourceEdges()).basicAdd(otherEnd, msgs);
+		case NotationPackage.EDGE__TARGET_EDGES:
+			return ((InternalEList) getTargetEdges()).basicAdd(otherEnd, msgs);
+		case NotationPackage.EDGE__SOURCE:
+			if (source != null)
+				msgs = ((InternalEObject) source).eInverseRemove(this, NotationPackage.VIEW__SOURCE_EDGES, View.class,
+						msgs);
+			return basicSetSource((View) otherEnd, msgs);
+		case NotationPackage.EDGE__TARGET:
+			if (target != null)
+				msgs = ((InternalEObject) target).eInverseRemove(this, NotationPackage.VIEW__TARGET_EDGES, View.class,
+						msgs);
+			return basicSetTarget((View) otherEnd, msgs);
 		}
 		return eDynamicInverseAdd(otherEnd, featureID, msgs);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.EDGE__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-			case NotationPackage.EDGE__SOURCE_EDGES:
-				return ((InternalEList)getSourceEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.EDGE__TARGET_EDGES:
-				return ((InternalEList)getTargetEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.EDGE__PERSISTED_CHILDREN:
-				return ((InternalEList)getPersistedChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.EDGE__STYLES:
-				return ((InternalEList)getStyles()).basicRemove(otherEnd, msgs);
-			case NotationPackage.EDGE__TRANSIENT_CHILDREN:
-				return ((InternalEList)getTransientChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.EDGE__SOURCE:
-				return basicSetSource(null, msgs);
-			case NotationPackage.EDGE__TARGET:
-				return basicSetTarget(null, msgs);
-			case NotationPackage.EDGE__BENDPOINTS:
-				return basicSetBendpoints(null, msgs);
-			case NotationPackage.EDGE__SOURCE_ANCHOR:
-				return basicSetSourceAnchor(null, msgs);
-			case NotationPackage.EDGE__TARGET_ANCHOR:
-				return basicSetTargetAnchor(null, msgs);
+		case NotationPackage.EDGE__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
+		case NotationPackage.EDGE__SOURCE_EDGES:
+			return ((InternalEList) getSourceEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.EDGE__TARGET_EDGES:
+			return ((InternalEList) getTargetEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.EDGE__PERSISTED_CHILDREN:
+			return ((InternalEList) getPersistedChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.EDGE__STYLES:
+			return ((InternalEList) getStyles()).basicRemove(otherEnd, msgs);
+		case NotationPackage.EDGE__TRANSIENT_CHILDREN:
+			return ((InternalEList) getTransientChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.EDGE__SOURCE:
+			return basicSetSource(null, msgs);
+		case NotationPackage.EDGE__TARGET:
+			return basicSetTarget(null, msgs);
+		case NotationPackage.EDGE__BENDPOINTS:
+			return basicSetBendpoints(null, msgs);
+		case NotationPackage.EDGE__SOURCE_ANCHOR:
+			return basicSetSourceAnchor(null, msgs);
+		case NotationPackage.EDGE__TARGET_ANCHOR:
+			return basicSetTargetAnchor(null, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.EDGE__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.EDGE__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.EDGE__TYPE:
-				return getType();
-			case NotationPackage.EDGE__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.EDGE__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.EDGE__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.EDGE__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.EDGE__STYLES:
-				return getStyles();
-			case NotationPackage.EDGE__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.EDGE__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.EDGE__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.EDGE__SOURCE:
-				return getSource();
-			case NotationPackage.EDGE__TARGET:
-				return getTarget();
-			case NotationPackage.EDGE__BENDPOINTS:
-				return getBendpoints();
-			case NotationPackage.EDGE__SOURCE_ANCHOR:
-				return getSourceAnchor();
-			case NotationPackage.EDGE__TARGET_ANCHOR:
-				return getTargetAnchor();
+		case NotationPackage.EDGE__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.EDGE__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.EDGE__TYPE:
+			return getType();
+		case NotationPackage.EDGE__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.EDGE__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.EDGE__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.EDGE__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.EDGE__STYLES:
+			return getStyles();
+		case NotationPackage.EDGE__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.EDGE__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.EDGE__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.EDGE__SOURCE:
+			return getSource();
+		case NotationPackage.EDGE__TARGET:
+			return getTarget();
+		case NotationPackage.EDGE__BENDPOINTS:
+			return getBendpoints();
+		case NotationPackage.EDGE__SOURCE_ANCHOR:
+			return getSourceAnchor();
+		case NotationPackage.EDGE__TARGET_ANCHOR:
+			return getTargetAnchor();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.EDGE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.EDGE__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.EDGE__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.EDGE__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.EDGE__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.EDGE__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.EDGE__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.EDGE__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.EDGE__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.EDGE__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.EDGE__SOURCE:
-				setSource((View)newValue);
-				return;
-			case NotationPackage.EDGE__TARGET:
-				setTarget((View)newValue);
-				return;
-			case NotationPackage.EDGE__BENDPOINTS:
-				setBendpoints((Bendpoints)newValue);
-				return;
-			case NotationPackage.EDGE__SOURCE_ANCHOR:
-				setSourceAnchor((Anchor)newValue);
-				return;
-			case NotationPackage.EDGE__TARGET_ANCHOR:
-				setTargetAnchor((Anchor)newValue);
-				return;
+		case NotationPackage.EDGE__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.EDGE__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.EDGE__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.EDGE__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.EDGE__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.EDGE__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.EDGE__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.EDGE__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.EDGE__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.EDGE__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.EDGE__SOURCE:
+			setSource((View) newValue);
+			return;
+		case NotationPackage.EDGE__TARGET:
+			setTarget((View) newValue);
+			return;
+		case NotationPackage.EDGE__BENDPOINTS:
+			setBendpoints((Bendpoints) newValue);
+			return;
+		case NotationPackage.EDGE__SOURCE_ANCHOR:
+			setSourceAnchor((Anchor) newValue);
+			return;
+		case NotationPackage.EDGE__TARGET_ANCHOR:
+			setTargetAnchor((Anchor) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.EDGE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.EDGE__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.EDGE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.EDGE__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.EDGE__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.EDGE__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.EDGE__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.EDGE__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.EDGE__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.EDGE__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.EDGE__SOURCE:
-				setSource((View)null);
-				return;
-			case NotationPackage.EDGE__TARGET:
-				setTarget((View)null);
-				return;
-			case NotationPackage.EDGE__BENDPOINTS:
-				setBendpoints((Bendpoints)null);
-				return;
-			case NotationPackage.EDGE__SOURCE_ANCHOR:
-				setSourceAnchor((Anchor)null);
-				return;
-			case NotationPackage.EDGE__TARGET_ANCHOR:
-				setTargetAnchor((Anchor)null);
-				return;
+		case NotationPackage.EDGE__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.EDGE__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.EDGE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.EDGE__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.EDGE__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.EDGE__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.EDGE__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.EDGE__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.EDGE__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.EDGE__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.EDGE__SOURCE:
+			setSource((View) null);
+			return;
+		case NotationPackage.EDGE__TARGET:
+			setTarget((View) null);
+			return;
+		case NotationPackage.EDGE__BENDPOINTS:
+			setBendpoints((Bendpoints) null);
+			return;
+		case NotationPackage.EDGE__SOURCE_ANCHOR:
+			setSourceAnchor((Anchor) null);
+			return;
+		case NotationPackage.EDGE__TARGET_ANCHOR:
+			setTargetAnchor((Anchor) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.EDGE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.EDGE__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.EDGE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.EDGE__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.EDGE__SOURCE_EDGES:
-				return sourceEdges != null && !sourceEdges.isEmpty();
-			case NotationPackage.EDGE__TARGET_EDGES:
-				return targetEdges != null && !targetEdges.isEmpty();
-			case NotationPackage.EDGE__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.EDGE__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.EDGE__ELEMENT:
-				return isSetElement();
-			case NotationPackage.EDGE__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.EDGE__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.EDGE__SOURCE:
-				return source != null;
-			case NotationPackage.EDGE__TARGET:
-				return target != null;
-			case NotationPackage.EDGE__BENDPOINTS:
-				return bendpoints != null;
-			case NotationPackage.EDGE__SOURCE_ANCHOR:
-				return sourceAnchor != null;
-			case NotationPackage.EDGE__TARGET_ANCHOR:
-				return targetAnchor != null;
+		case NotationPackage.EDGE__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.EDGE__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.EDGE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.EDGE__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.EDGE__SOURCE_EDGES:
+			return sourceEdges != null && !sourceEdges.isEmpty();
+		case NotationPackage.EDGE__TARGET_EDGES:
+			return targetEdges != null && !targetEdges.isEmpty();
+		case NotationPackage.EDGE__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.EDGE__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.EDGE__ELEMENT:
+			return isSetElement();
+		case NotationPackage.EDGE__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.EDGE__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.EDGE__SOURCE:
+			return source != null;
+		case NotationPackage.EDGE__TARGET:
+			return target != null;
+		case NotationPackage.EDGE__BENDPOINTS:
+			return bendpoints != null;
+		case NotationPackage.EDGE__SOURCE_ANCHOR:
+			return sourceAnchor != null;
+		case NotationPackage.EDGE__TARGET_ANCHOR:
+			return targetAnchor != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //EdgeImpl
+} // EdgeImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FillStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FillStyleImpl.java
index 1e1aebf..4bd370f 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FillStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FillStyleImpl.java
@@ -21,17 +21,19 @@
 import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Fill Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Fill
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl#getFillColor <em>Fill Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl#getTransparency <em>Transparency</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl#getGradient <em>Gradient</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl#getFillColor
+ * <em>Fill Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl#getTransparency
+ * <em>Transparency</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FillStyleImpl#getGradient
+ * <em>Gradient</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -39,228 +41,232 @@
  * @canBeSeenBy %partners
  */
 public class FillStyleImpl extends MinimalEObjectImpl.Container implements FillStyle {
-    /**
-	 * The default value of the '{@link #getFillColor() <em>Fill Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getFillColor() <em>Fill Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFillColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int FILL_COLOR_EDEFAULT = 16777215;
 
-    /**
-	 * The cached value of the '{@link #getFillColor() <em>Fill Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getFillColor() <em>Fill Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFillColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected int fillColor = FILL_COLOR_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getTransparency() <em>Transparency</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getTransparency() <em>Transparency</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTransparency()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int TRANSPARENCY_EDEFAULT = -1;
 
-				/**
-	 * The cached value of the '{@link #getTransparency() <em>Transparency</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getTransparency() <em>Transparency</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTransparency()
 	 * @generated
 	 * @ordered
 	 */
 	protected int transparency = TRANSPARENCY_EDEFAULT;
 
-				/**
-	 * The default value of the '{@link #getGradient() <em>Gradient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getGradient() <em>Gradient</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGradient()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final GradientData GRADIENT_EDEFAULT = null;
 
-				/**
+	/**
 	 * The cached value of the '{@link #getGradient() <em>Gradient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGradient()
 	 * @generated
 	 * @ordered
 	 */
 	protected GradientData gradient = GRADIENT_EDEFAULT;
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FillStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.FILL_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getFillColor() {
 		return fillColor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFillColor(int newFillColor) {
 		int oldFillColor = fillColor;
 		fillColor = newFillColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILL_STYLE__FILL_COLOR, oldFillColor, fillColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILL_STYLE__FILL_COLOR, oldFillColor,
+					fillColor));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getTransparency() {
 		return transparency;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTransparency(int newTransparency) {
 		int oldTransparency = transparency;
 		transparency = newTransparency;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILL_STYLE__TRANSPARENCY, oldTransparency, transparency));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILL_STYLE__TRANSPARENCY,
+					oldTransparency, transparency));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GradientData getGradient() {
 		return gradient;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGradient(GradientData newGradient) {
 		GradientData oldGradient = gradient;
 		gradient = newGradient;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILL_STYLE__GRADIENT, oldGradient, gradient));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILL_STYLE__GRADIENT, oldGradient,
+					gradient));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.FILL_STYLE__FILL_COLOR:
-				return new Integer(getFillColor());
-			case NotationPackage.FILL_STYLE__TRANSPARENCY:
-				return new Integer(getTransparency());
-			case NotationPackage.FILL_STYLE__GRADIENT:
-				return getGradient();
+		case NotationPackage.FILL_STYLE__FILL_COLOR:
+			return new Integer(getFillColor());
+		case NotationPackage.FILL_STYLE__TRANSPARENCY:
+			return new Integer(getTransparency());
+		case NotationPackage.FILL_STYLE__GRADIENT:
+			return getGradient();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.FILL_STYLE__FILL_COLOR:
-				setFillColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.FILL_STYLE__TRANSPARENCY:
-				setTransparency(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.FILL_STYLE__GRADIENT:
-				setGradient((GradientData)newValue);
-				return;
+		case NotationPackage.FILL_STYLE__FILL_COLOR:
+			setFillColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.FILL_STYLE__TRANSPARENCY:
+			setTransparency(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.FILL_STYLE__GRADIENT:
+			setGradient((GradientData) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.FILL_STYLE__FILL_COLOR:
-				setFillColor(FILL_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.FILL_STYLE__TRANSPARENCY:
-				setTransparency(TRANSPARENCY_EDEFAULT);
-				return;
-			case NotationPackage.FILL_STYLE__GRADIENT:
-				setGradient(GRADIENT_EDEFAULT);
-				return;
+		case NotationPackage.FILL_STYLE__FILL_COLOR:
+			setFillColor(FILL_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.FILL_STYLE__TRANSPARENCY:
+			setTransparency(TRANSPARENCY_EDEFAULT);
+			return;
+		case NotationPackage.FILL_STYLE__GRADIENT:
+			setGradient(GRADIENT_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.FILL_STYLE__FILL_COLOR:
-				return fillColor != FILL_COLOR_EDEFAULT;
-			case NotationPackage.FILL_STYLE__TRANSPARENCY:
-				return transparency != TRANSPARENCY_EDEFAULT;
-			case NotationPackage.FILL_STYLE__GRADIENT:
-				return GRADIENT_EDEFAULT == null ? gradient != null : !GRADIENT_EDEFAULT.equals(gradient);
+		case NotationPackage.FILL_STYLE__FILL_COLOR:
+			return fillColor != FILL_COLOR_EDEFAULT;
+		case NotationPackage.FILL_STYLE__TRANSPARENCY:
+			return transparency != TRANSPARENCY_EDEFAULT;
+		case NotationPackage.FILL_STYLE__GRADIENT:
+			return GRADIENT_EDEFAULT == null ? gradient != null : !GRADIENT_EDEFAULT.equals(gradient);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fillColor: "); //$NON-NLS-1$
@@ -273,4 +279,4 @@
 		return result.toString();
 	}
 
-} //FillStyleImpl
+} // FillStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FilteringStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FilteringStyleImpl.java
index 300ddfa..cef0ccb 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FilteringStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FilteringStyleImpl.java
@@ -30,17 +30,19 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Filtering Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Filtering Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl#getFiltering <em>Filtering</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl#getFilteringKeys <em>Filtering Keys</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl#getFilteredObjects <em>Filtered Objects</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl#getFiltering
+ * <em>Filtering</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl#getFilteringKeys
+ * <em>Filtering Keys</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl#getFilteredObjects
+ * <em>Filtered Objects</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -48,133 +50,138 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class FilteringStyleImpl extends MinimalEObjectImpl.Container implements FilteringStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
-	protected int eFlags = 0 ;
-	
-    /**
-	 * The default value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	protected int eFlags = 0;
+
+	/**
+	 * The default value of the '{@link #getFiltering() <em>Filtering</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFiltering()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final Filtering FILTERING_EDEFAULT = Filtering.NONE_LITERAL;
 
-    /**
-	 * The offset of the flags representing the value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The offset of the flags representing the value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int FILTERING_EFLAG_OFFSET = 8;
 
-				/**
-	 * The flags representing the default value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the default value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int FILTERING_EFLAG_DEFAULT = Filtering.VALUES.indexOf(FILTERING_EDEFAULT) << FILTERING_EFLAG_OFFSET;
+	protected static final int FILTERING_EFLAG_DEFAULT = Filtering.VALUES
+			.indexOf(FILTERING_EDEFAULT) << FILTERING_EFLAG_OFFSET;
 
-				/**
-	 * The array of enumeration values for '{@link Filtering Filtering}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The array of enumeration values for '{@link Filtering Filtering}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Filtering[] FILTERING_EFLAG_VALUES = (Filtering[])Filtering.VALUES.toArray(new Filtering[Filtering.VALUES.size()]);
+	private static final Filtering[] FILTERING_EFLAG_VALUES = (Filtering[]) Filtering.VALUES
+			.toArray(new Filtering[Filtering.VALUES.size()]);
 
-				/**
-	 * The flags representing the value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFiltering()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int FILTERING_EFLAG = 0x3 << FILTERING_EFLAG_OFFSET;
 
-				/**
-	 * The default value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getFilteringKeys() <em>Filtering
+	 * Keys</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteringKeys()
 	 * @generated NOT
 	 * @ordered
 	 */
 	protected static final List FILTERING_KEYS_EDEFAULT = Collections.EMPTY_LIST;
 
-    /**
-	 * The cached value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteringKeys()
 	 * @generated
 	 * @ordered
 	 */
 	protected List filteringKeys = FILTERING_KEYS_EDEFAULT;
 
-    /**
-	 * The cached value of the '{@link #getFilteredObjects() <em>Filtered Objects</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getFilteredObjects() <em>Filtered
+	 * Objects</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteredObjects()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList filteredObjects;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FilteringStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.FILTERING_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Filtering getFiltering() {
 		return FILTERING_EFLAG_VALUES[(eFlags & FILTERING_EFLAG) >>> FILTERING_EFLAG_OFFSET];
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFiltering(Filtering newFiltering) {
 		Filtering oldFiltering = FILTERING_EFLAG_VALUES[(eFlags & FILTERING_EFLAG) >>> FILTERING_EFLAG_OFFSET];
-		if (newFiltering == null) newFiltering = FILTERING_EDEFAULT;
+		if (newFiltering == null)
+			newFiltering = FILTERING_EDEFAULT;
 		eFlags = eFlags & ~FILTERING_EFLAG | Filtering.VALUES.indexOf(newFiltering) << FILTERING_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILTERING_STYLE__FILTERING, oldFiltering, newFiltering));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILTERING_STYLE__FILTERING,
+					oldFiltering, newFiltering));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public List getFilteringKeys() {
@@ -182,23 +189,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List getFilteringKeysGen() {
 		return filteringKeys;
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setFilteringKeys(List newFilteringKeys) {
-		if (newFilteringKeys == null )
+		if (newFilteringKeys == null)
 			throw new NullPointerException("the 'newFilteringKeys' parameter is null"); //$NON-NLS-1$
-		
+
 		if (newFilteringKeys.isEmpty())
 			setFilteringKeysGen(FILTERING_KEYS_EDEFAULT);
 		else {
@@ -206,7 +213,8 @@
 			for (Iterator i = newFilteringKeys.iterator(); i.hasNext();) {
 				Object key = i.next();
 				if (!(key instanceof String))
-					throw new IllegalArgumentException("One or more objects in the list is not of type java.lang.String"); //$NON-NLS-1$
+					throw new IllegalArgumentException(
+							"One or more objects in the list is not of type java.lang.String"); //$NON-NLS-1$
 				tempList.add(key);
 			}
 			setFilteringKeysGen(tempList);
@@ -214,111 +222,115 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFilteringKeysGen(List newFilteringKeys) {
 		List oldFilteringKeys = filteringKeys;
 		filteringKeys = newFilteringKeys;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILTERING_STYLE__FILTERING_KEYS, oldFilteringKeys, filteringKeys));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FILTERING_STYLE__FILTERING_KEYS,
+					oldFilteringKeys, filteringKeys));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getFilteredObjects() {
 		if (filteredObjects == null) {
-			filteredObjects = new EObjectResolvingEList(EObject.class, this, NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS);
+			filteredObjects = new EObjectResolvingEList(EObject.class, this,
+					NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS);
 		}
 		return filteredObjects;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.FILTERING_STYLE__FILTERING:
-				return getFiltering();
-			case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
-				return getFilteringKeys();
-			case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
-				return getFilteredObjects();
+		case NotationPackage.FILTERING_STYLE__FILTERING:
+			return getFiltering();
+		case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
+			return getFilteringKeys();
+		case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
+			return getFilteredObjects();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.FILTERING_STYLE__FILTERING:
-				setFiltering((Filtering)newValue);
-				return;
-			case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
-				setFilteringKeys((List)newValue);
-				return;
-			case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
-				getFilteredObjects().clear();
-				getFilteredObjects().addAll((Collection)newValue);
-				return;
+		case NotationPackage.FILTERING_STYLE__FILTERING:
+			setFiltering((Filtering) newValue);
+			return;
+		case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
+			setFilteringKeys((List) newValue);
+			return;
+		case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
+			getFilteredObjects().clear();
+			getFilteredObjects().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.FILTERING_STYLE__FILTERING:
-				setFiltering(FILTERING_EDEFAULT);
-				return;
-			case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
-				setFilteringKeys(FILTERING_KEYS_EDEFAULT);
-				return;
-			case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
-				getFilteredObjects().clear();
-				return;
+		case NotationPackage.FILTERING_STYLE__FILTERING:
+			setFiltering(FILTERING_EDEFAULT);
+			return;
+		case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
+			setFilteringKeys(FILTERING_KEYS_EDEFAULT);
+			return;
+		case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
+			getFilteredObjects().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.FILTERING_STYLE__FILTERING:
-				return (eFlags & FILTERING_EFLAG) != FILTERING_EFLAG_DEFAULT;
-			case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
-				return FILTERING_KEYS_EDEFAULT == null ? filteringKeys != null : !FILTERING_KEYS_EDEFAULT.equals(filteringKeys);
-			case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
-				return filteredObjects != null && !filteredObjects.isEmpty();
+		case NotationPackage.FILTERING_STYLE__FILTERING:
+			return (eFlags & FILTERING_EFLAG) != FILTERING_EFLAG_DEFAULT;
+		case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
+			return FILTERING_KEYS_EDEFAULT == null ? filteringKeys != null
+					: !FILTERING_KEYS_EDEFAULT.equals(filteringKeys);
+		case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
+			return filteredObjects != null && !filteredObjects.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (filtering: "); //$NON-NLS-1$
@@ -329,4 +341,4 @@
 		return result.toString();
 	}
 
-} //FilteringStyleImpl
+} // FilteringStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FontStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FontStyleImpl.java
index bd119bd..8060200 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FontStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/FontStyleImpl.java
@@ -20,21 +20,27 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Font Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Font
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#getFontColor <em>Font Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#getFontName <em>Font Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#getFontHeight <em>Font Height</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#isBold <em>Bold</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#isItalic <em>Italic</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#isUnderline <em>Underline</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#isStrikeThrough <em>Strike Through</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#getFontColor
+ * <em>Font Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#getFontName
+ * <em>Font Name</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#getFontHeight
+ * <em>Font Height</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#isBold
+ * <em>Bold</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#isItalic
+ * <em>Italic</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#isUnderline
+ * <em>Underline</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.FontStyleImpl#isStrikeThrough
+ * <em>Strike Through</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -42,174 +48,175 @@
  * @canBeSeenBy %partners
  */
 public class FontStyleImpl extends MinimalEObjectImpl.Container implements FontStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
-    /**
-	 * The default value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * The default value of the '{@link #getFontColor() <em>Font Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int FONT_COLOR_EDEFAULT = 0;
 
-    /**
-	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected int fontColor = FONT_COLOR_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getFontName() <em>Font Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final String FONT_NAME_EDEFAULT = "Tahoma"; //$NON-NLS-1$
 
-    /**
-	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
 	 */
 	protected String fontName = FONT_NAME_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int FONT_HEIGHT_EDEFAULT = 9;
 
-    /**
-	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected int fontHeight = FONT_HEIGHT_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isBold()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean BOLD_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isBold() <em>Bold</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isBold() <em>Bold</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isBold()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int BOLD_EFLAG = 1 << 8;
 
-    /**
+	/**
 	 * The default value of the '{@link #isItalic() <em>Italic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isItalic()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean ITALIC_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isItalic() <em>Italic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isItalic() <em>Italic</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isItalic()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ITALIC_EFLAG = 1 << 9;
 
-    /**
-	 * The default value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #isUnderline() <em>Underline</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isUnderline()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean UNDERLINE_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isUnderline()
+	 * <em>Underline</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isUnderline()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int UNDERLINE_EFLAG = 1 << 10;
 
-    /**
-	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isStrikeThrough()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean STRIKE_THROUGH_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isStrikeThrough() <em>Strike
+	 * Through</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isStrikeThrough()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int STRIKE_THROUGH_EFLAG = 1 << 11;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FontStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.FONT_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getFontName() {
@@ -217,17 +224,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setFontName(String newFontName) {
 		setFontNameGen(newFontName == null ? null : newFontName.intern());
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @since 1.2
 	 */
@@ -235,256 +242,275 @@
 		String oldFontName = fontName;
 		fontName = newFontName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__FONT_NAME, oldFontName, fontName));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__FONT_NAME, oldFontName,
+					fontName));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getFontHeight() {
 		return fontHeight;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontHeight(int newFontHeight) {
 		int oldFontHeight = fontHeight;
 		fontHeight = newFontHeight;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__FONT_HEIGHT, oldFontHeight, fontHeight));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__FONT_HEIGHT,
+					oldFontHeight, fontHeight));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isBold() {
 		return (eFlags & BOLD_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBold(boolean newBold) {
 		boolean oldBold = (eFlags & BOLD_EFLAG) != 0;
-		if (newBold) eFlags |= BOLD_EFLAG; else eFlags &= ~BOLD_EFLAG;
+		if (newBold)
+			eFlags |= BOLD_EFLAG;
+		else
+			eFlags &= ~BOLD_EFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__BOLD, oldBold, newBold));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isItalic() {
 		return (eFlags & ITALIC_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setItalic(boolean newItalic) {
 		boolean oldItalic = (eFlags & ITALIC_EFLAG) != 0;
-		if (newItalic) eFlags |= ITALIC_EFLAG; else eFlags &= ~ITALIC_EFLAG;
+		if (newItalic)
+			eFlags |= ITALIC_EFLAG;
+		else
+			eFlags &= ~ITALIC_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__ITALIC, oldItalic, newItalic));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__ITALIC, oldItalic,
+					newItalic));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isUnderline() {
 		return (eFlags & UNDERLINE_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setUnderline(boolean newUnderline) {
 		boolean oldUnderline = (eFlags & UNDERLINE_EFLAG) != 0;
-		if (newUnderline) eFlags |= UNDERLINE_EFLAG; else eFlags &= ~UNDERLINE_EFLAG;
+		if (newUnderline)
+			eFlags |= UNDERLINE_EFLAG;
+		else
+			eFlags &= ~UNDERLINE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__UNDERLINE, oldUnderline, newUnderline));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__UNDERLINE, oldUnderline,
+					newUnderline));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isStrikeThrough() {
 		return (eFlags & STRIKE_THROUGH_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStrikeThrough(boolean newStrikeThrough) {
 		boolean oldStrikeThrough = (eFlags & STRIKE_THROUGH_EFLAG) != 0;
-		if (newStrikeThrough) eFlags |= STRIKE_THROUGH_EFLAG; else eFlags &= ~STRIKE_THROUGH_EFLAG;
+		if (newStrikeThrough)
+			eFlags |= STRIKE_THROUGH_EFLAG;
+		else
+			eFlags &= ~STRIKE_THROUGH_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__STRIKE_THROUGH, oldStrikeThrough, newStrikeThrough));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__STRIKE_THROUGH,
+					oldStrikeThrough, newStrikeThrough));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.FONT_STYLE__FONT_COLOR:
-				return new Integer(getFontColor());
-			case NotationPackage.FONT_STYLE__FONT_NAME:
-				return getFontName();
-			case NotationPackage.FONT_STYLE__FONT_HEIGHT:
-				return new Integer(getFontHeight());
-			case NotationPackage.FONT_STYLE__BOLD:
-				return isBold() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.FONT_STYLE__ITALIC:
-				return isItalic() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.FONT_STYLE__UNDERLINE:
-				return isUnderline() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
-				return isStrikeThrough() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.FONT_STYLE__FONT_COLOR:
+			return new Integer(getFontColor());
+		case NotationPackage.FONT_STYLE__FONT_NAME:
+			return getFontName();
+		case NotationPackage.FONT_STYLE__FONT_HEIGHT:
+			return new Integer(getFontHeight());
+		case NotationPackage.FONT_STYLE__BOLD:
+			return isBold() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.FONT_STYLE__ITALIC:
+			return isItalic() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.FONT_STYLE__UNDERLINE:
+			return isUnderline() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
+			return isStrikeThrough() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.FONT_STYLE__FONT_COLOR:
-				setFontColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.FONT_STYLE__FONT_NAME:
-				setFontName((String)newValue);
-				return;
-			case NotationPackage.FONT_STYLE__FONT_HEIGHT:
-				setFontHeight(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.FONT_STYLE__BOLD:
-				setBold(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.FONT_STYLE__ITALIC:
-				setItalic(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.FONT_STYLE__UNDERLINE:
-				setUnderline(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
-				setStrikeThrough(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.FONT_STYLE__FONT_COLOR:
+			setFontColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.FONT_STYLE__FONT_NAME:
+			setFontName((String) newValue);
+			return;
+		case NotationPackage.FONT_STYLE__FONT_HEIGHT:
+			setFontHeight(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.FONT_STYLE__BOLD:
+			setBold(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.FONT_STYLE__ITALIC:
+			setItalic(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.FONT_STYLE__UNDERLINE:
+			setUnderline(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
+			setStrikeThrough(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.FONT_STYLE__FONT_COLOR:
-				setFontColor(FONT_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.FONT_STYLE__FONT_NAME:
-				setFontName(FONT_NAME_EDEFAULT);
-				return;
-			case NotationPackage.FONT_STYLE__FONT_HEIGHT:
-				setFontHeight(FONT_HEIGHT_EDEFAULT);
-				return;
-			case NotationPackage.FONT_STYLE__BOLD:
-				setBold(BOLD_EDEFAULT);
-				return;
-			case NotationPackage.FONT_STYLE__ITALIC:
-				setItalic(ITALIC_EDEFAULT);
-				return;
-			case NotationPackage.FONT_STYLE__UNDERLINE:
-				setUnderline(UNDERLINE_EDEFAULT);
-				return;
-			case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
-				setStrikeThrough(STRIKE_THROUGH_EDEFAULT);
-				return;
+		case NotationPackage.FONT_STYLE__FONT_COLOR:
+			setFontColor(FONT_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.FONT_STYLE__FONT_NAME:
+			setFontName(FONT_NAME_EDEFAULT);
+			return;
+		case NotationPackage.FONT_STYLE__FONT_HEIGHT:
+			setFontHeight(FONT_HEIGHT_EDEFAULT);
+			return;
+		case NotationPackage.FONT_STYLE__BOLD:
+			setBold(BOLD_EDEFAULT);
+			return;
+		case NotationPackage.FONT_STYLE__ITALIC:
+			setItalic(ITALIC_EDEFAULT);
+			return;
+		case NotationPackage.FONT_STYLE__UNDERLINE:
+			setUnderline(UNDERLINE_EDEFAULT);
+			return;
+		case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
+			setStrikeThrough(STRIKE_THROUGH_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.FONT_STYLE__FONT_COLOR:
-				return fontColor != FONT_COLOR_EDEFAULT;
-			case NotationPackage.FONT_STYLE__FONT_NAME:
-				return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
-			case NotationPackage.FONT_STYLE__FONT_HEIGHT:
-				return fontHeight != FONT_HEIGHT_EDEFAULT;
-			case NotationPackage.FONT_STYLE__BOLD:
-				return ((eFlags & BOLD_EFLAG) != 0) != BOLD_EDEFAULT;
-			case NotationPackage.FONT_STYLE__ITALIC:
-				return ((eFlags & ITALIC_EFLAG) != 0) != ITALIC_EDEFAULT;
-			case NotationPackage.FONT_STYLE__UNDERLINE:
-				return ((eFlags & UNDERLINE_EFLAG) != 0) != UNDERLINE_EDEFAULT;
-			case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
-				return ((eFlags & STRIKE_THROUGH_EFLAG) != 0) != STRIKE_THROUGH_EDEFAULT;
+		case NotationPackage.FONT_STYLE__FONT_COLOR:
+			return fontColor != FONT_COLOR_EDEFAULT;
+		case NotationPackage.FONT_STYLE__FONT_NAME:
+			return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
+		case NotationPackage.FONT_STYLE__FONT_HEIGHT:
+			return fontHeight != FONT_HEIGHT_EDEFAULT;
+		case NotationPackage.FONT_STYLE__BOLD:
+			return ((eFlags & BOLD_EFLAG) != 0) != BOLD_EDEFAULT;
+		case NotationPackage.FONT_STYLE__ITALIC:
+			return ((eFlags & ITALIC_EFLAG) != 0) != ITALIC_EDEFAULT;
+		case NotationPackage.FONT_STYLE__UNDERLINE:
+			return ((eFlags & UNDERLINE_EFLAG) != 0) != UNDERLINE_EDEFAULT;
+		case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
+			return ((eFlags & STRIKE_THROUGH_EFLAG) != 0) != STRIKE_THROUGH_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getFontColor() {
 		return fontColor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontColor(int newFontColor) {
 		int oldFontColor = fontColor;
 		fontColor = newFontColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__FONT_COLOR, oldFontColor, fontColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.FONT_STYLE__FONT_COLOR, oldFontColor,
+					fontColor));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fontColor: "); //$NON-NLS-1$
@@ -505,4 +531,4 @@
 		return result.toString();
 	}
 
-} //FontStyleImpl
+} // FontStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/GuideImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/GuideImpl.java
index 71db296..a76e79a 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/GuideImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/GuideImpl.java
@@ -26,16 +26,17 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Guide</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Guide</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.GuideImpl#getPosition <em>Position</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.GuideImpl#getNodeMap <em>Node Map</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.GuideImpl#getPosition
+ * <em>Position</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.GuideImpl#getNodeMap
+ * <em>Node Map</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -43,172 +44,177 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class GuideImpl extends MinimalEObjectImpl.Container implements Guide {
-    /**
-	 * The default value of the '{@link #getPosition() <em>Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getPosition() <em>Position</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPosition()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int POSITION_EDEFAULT = 0;
 
-    /**
+	/**
 	 * The cached value of the '{@link #getPosition() <em>Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPosition()
 	 * @generated
 	 * @ordered
 	 */
 	protected int position = POSITION_EDEFAULT;
 
-    /**
-	 * The cached value of the '{@link #getNodeMap() <em>Node Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getNodeMap() <em>Node Map</em>}' map. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getNodeMap()
 	 * @generated
 	 * @ordered
 	 */
 	protected EMap nodeMap;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GuideImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.GUIDE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPosition() {
 		return position;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPosition(int newPosition) {
 		int oldPosition = position;
 		position = newPosition;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.GUIDE__POSITION, oldPosition, position));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.GUIDE__POSITION, oldPosition,
+					position));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EMap getNodeMap() {
 		if (nodeMap == null) {
-			nodeMap = new EcoreEMap(NotationPackage.Literals.NODE_ENTRY, NodeEntryImpl.class, this, NotationPackage.GUIDE__NODE_MAP);
+			nodeMap = new EcoreEMap(NotationPackage.Literals.NODE_ENTRY, NodeEntryImpl.class, this,
+					NotationPackage.GUIDE__NODE_MAP);
 		}
 		return nodeMap;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.GUIDE__NODE_MAP:
-				return ((InternalEList)getNodeMap()).basicRemove(otherEnd, msgs);
+		case NotationPackage.GUIDE__NODE_MAP:
+			return ((InternalEList) getNodeMap()).basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.GUIDE__POSITION:
-				return new Integer(getPosition());
-			case NotationPackage.GUIDE__NODE_MAP:
-				if (coreType) return getNodeMap();
-				else return getNodeMap().map();
+		case NotationPackage.GUIDE__POSITION:
+			return new Integer(getPosition());
+		case NotationPackage.GUIDE__NODE_MAP:
+			if (coreType)
+				return getNodeMap();
+			else
+				return getNodeMap().map();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.GUIDE__POSITION:
-				setPosition(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.GUIDE__NODE_MAP:
-				((EStructuralFeature.Setting)getNodeMap()).set(newValue);
-				return;
+		case NotationPackage.GUIDE__POSITION:
+			setPosition(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.GUIDE__NODE_MAP:
+			((EStructuralFeature.Setting) getNodeMap()).set(newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.GUIDE__POSITION:
-				setPosition(POSITION_EDEFAULT);
-				return;
-			case NotationPackage.GUIDE__NODE_MAP:
-				getNodeMap().clear();
-				return;
+		case NotationPackage.GUIDE__POSITION:
+			setPosition(POSITION_EDEFAULT);
+			return;
+		case NotationPackage.GUIDE__NODE_MAP:
+			getNodeMap().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.GUIDE__POSITION:
-				return position != POSITION_EDEFAULT;
-			case NotationPackage.GUIDE__NODE_MAP:
-				return nodeMap != null && !nodeMap.isEmpty();
+		case NotationPackage.GUIDE__POSITION:
+			return position != POSITION_EDEFAULT;
+		case NotationPackage.GUIDE__NODE_MAP:
+			return nodeMap != null && !nodeMap.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (position: "); //$NON-NLS-1$
@@ -217,4 +223,4 @@
 		return result.toString();
 	}
 
-} //GuideImpl
+} // GuideImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/GuideStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/GuideStyleImpl.java
index e688acc..044f01f 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/GuideStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/GuideStyleImpl.java
@@ -26,16 +26,17 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Guide Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Guide
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl#getHorizontalGuides <em>Horizontal Guides</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl#getVerticalGuides <em>Vertical Guides</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl#getHorizontalGuides
+ * <em>Horizontal Guides</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl#getVerticalGuides
+ * <em>Vertical Guides</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -43,147 +44,151 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class GuideStyleImpl extends MinimalEObjectImpl.Container implements GuideStyle {
-    /**
-	 * The cached value of the '{@link #getHorizontalGuides() <em>Horizontal Guides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getHorizontalGuides() <em>Horizontal
+	 * Guides</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHorizontalGuides()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList horizontalGuides;
 
-    /**
-	 * The cached value of the '{@link #getVerticalGuides() <em>Vertical Guides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getVerticalGuides() <em>Vertical
+	 * Guides</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getVerticalGuides()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList verticalGuides;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GuideStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.GUIDE_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getHorizontalGuides() {
 		if (horizontalGuides == null) {
-			horizontalGuides = new EObjectContainmentEList(Guide.class, this, NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES);
+			horizontalGuides = new EObjectContainmentEList(Guide.class, this,
+					NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES);
 		}
 		return horizontalGuides;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getVerticalGuides() {
 		if (verticalGuides == null) {
-			verticalGuides = new EObjectContainmentEList(Guide.class, this, NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES);
+			verticalGuides = new EObjectContainmentEList(Guide.class, this,
+					NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES);
 		}
 		return verticalGuides;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
-				return ((InternalEList)getHorizontalGuides()).basicRemove(otherEnd, msgs);
-			case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
-				return ((InternalEList)getVerticalGuides()).basicRemove(otherEnd, msgs);
+		case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
+			return ((InternalEList) getHorizontalGuides()).basicRemove(otherEnd, msgs);
+		case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
+			return ((InternalEList) getVerticalGuides()).basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
-				return getHorizontalGuides();
-			case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
-				return getVerticalGuides();
+		case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
+			return getHorizontalGuides();
+		case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
+			return getVerticalGuides();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
-				getHorizontalGuides().clear();
-				getHorizontalGuides().addAll((Collection)newValue);
-				return;
-			case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
-				getVerticalGuides().clear();
-				getVerticalGuides().addAll((Collection)newValue);
-				return;
+		case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
+			getHorizontalGuides().clear();
+			getHorizontalGuides().addAll((Collection) newValue);
+			return;
+		case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
+			getVerticalGuides().clear();
+			getVerticalGuides().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
-				getHorizontalGuides().clear();
-				return;
-			case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
-				getVerticalGuides().clear();
-				return;
+		case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
+			getHorizontalGuides().clear();
+			return;
+		case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
+			getVerticalGuides().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
-				return horizontalGuides != null && !horizontalGuides.isEmpty();
-			case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
-				return verticalGuides != null && !verticalGuides.isEmpty();
+		case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
+			return horizontalGuides != null && !horizontalGuides.isEmpty();
+		case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
+			return verticalGuides != null && !verticalGuides.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //GuideStyleImpl
+} // GuideStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/HintedDiagramLinkStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/HintedDiagramLinkStyleImpl.java
index 80a462c..b51f445 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/HintedDiagramLinkStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/HintedDiagramLinkStyleImpl.java
@@ -12,33 +12,30 @@
 package org.eclipse.gmf.runtime.notation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Hinted Diagram Link Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Hinted
+ * Diagram Link Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl#getHint <em>Hint</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl#getHint
+ * <em>Hint</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class HintedDiagramLinkStyleImpl extends DiagramLinkStyleImpl implements HintedDiagramLinkStyle {
 	/**
-	 * The default value of the '{@link #getHint() <em>Hint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getHint() <em>Hint</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHint()
 	 * @generated
 	 * @ordered
@@ -46,9 +43,9 @@
 	protected static final String HINT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getHint() <em>Hint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHint() <em>Hint</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHint()
 	 * @generated
 	 * @ordered
@@ -56,8 +53,8 @@
 	protected String hint = HINT_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HintedDiagramLinkStyleImpl() {
@@ -65,8 +62,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -74,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getHint() {
@@ -83,89 +80,92 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHint(String newHint) {
 		String oldHint = hint;
 		hint = newHint;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT, oldHint, hint));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT,
+					oldHint, hint));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
-				if (resolve) return getDiagramLink();
-				return basicGetDiagramLink();
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT:
-				return getHint();
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
+			if (resolve)
+				return getDiagramLink();
+			return basicGetDiagramLink();
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT:
+			return getHint();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
-				setDiagramLink((Diagram)newValue);
-				return;
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT:
-				setHint((String)newValue);
-				return;
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
+			setDiagramLink((Diagram) newValue);
+			return;
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT:
+			setHint((String) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
-				setDiagramLink((Diagram)null);
-				return;
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT:
-				setHint(HINT_EDEFAULT);
-				return;
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
+			setDiagramLink((Diagram) null);
+			return;
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT:
+			setHint(HINT_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
-				return diagramLink != null;
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT:
-				return HINT_EDEFAULT == null ? hint != null : !HINT_EDEFAULT.equals(hint);
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__DIAGRAM_LINK:
+			return diagramLink != null;
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE__HINT:
+			return HINT_EDEFAULT == null ? hint != null : !HINT_EDEFAULT.equals(hint);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (hint: "); //$NON-NLS-1$
@@ -174,4 +174,4 @@
 		return result.toString();
 	}
 
-} //HintedDiagramLinkStyleImpl
+} // HintedDiagramLinkStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IdentityAnchorImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IdentityAnchorImpl.java
index 047a0f0..722c513 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IdentityAnchorImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IdentityAnchorImpl.java
@@ -20,15 +20,15 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Identity Anchor</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Identity Anchor</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl#getId <em>Id</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl#getId
+ * <em>Id</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -36,56 +36,56 @@
  * @canBeSeenBy %partners
  */
 public class IdentityAnchorImpl extends MinimalEObjectImpl.Container implements IdentityAnchor {
-    /**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final String ID_EDEFAULT = "anchor"; //$NON-NLS-1$
 
-    /**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
 	 */
 	protected String id = ID_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IdentityAnchorImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.IDENTITY_ANCHOR;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
 		return id;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
@@ -95,67 +95,68 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IDENTITY_ANCHOR__ID, oldId, id));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.IDENTITY_ANCHOR__ID:
-				return getId();
+		case NotationPackage.IDENTITY_ANCHOR__ID:
+			return getId();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.IDENTITY_ANCHOR__ID:
-				setId((String)newValue);
-				return;
+		case NotationPackage.IDENTITY_ANCHOR__ID:
+			setId((String) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.IDENTITY_ANCHOR__ID:
-				setId(ID_EDEFAULT);
-				return;
+		case NotationPackage.IDENTITY_ANCHOR__ID:
+			setId(ID_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.IDENTITY_ANCHOR__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		case NotationPackage.IDENTITY_ANCHOR__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (id: "); //$NON-NLS-1$
@@ -164,4 +165,4 @@
 		return result.toString();
 	}
 
-} //IdentityAnchorImpl
+} // IdentityAnchorImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageBufferStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageBufferStyleImpl.java
index da1c9f9..9ade4f3 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageBufferStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageBufferStyleImpl.java
@@ -23,15 +23,15 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Image Buffer Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Image
+ * Buffer Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl#getImageBuffer <em>Image Buffer</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl#getImageBuffer
+ * <em>Image Buffer</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -39,174 +39,182 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class ImageBufferStyleImpl extends ImageStyleImpl implements ImageBufferStyle {
-    /**
-	 * The cached value of the '{@link #getImageBuffer() <em>Image Buffer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getImageBuffer() <em>Image Buffer</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getImageBuffer()
 	 * @generated
 	 * @ordered
 	 */
 	protected Image imageBuffer;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageBufferStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.IMAGE_BUFFER_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Image getImageBuffer() {
 		return imageBuffer;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetImageBuffer(Image newImageBuffer, NotificationChain msgs) {
 		Image oldImageBuffer = imageBuffer;
 		imageBuffer = newImageBuffer;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER, oldImageBuffer, newImageBuffer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER, oldImageBuffer, newImageBuffer);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setImageBuffer(Image newImageBuffer) {
 		if (newImageBuffer != imageBuffer) {
 			NotificationChain msgs = null;
 			if (imageBuffer != null)
-				msgs = ((InternalEObject)imageBuffer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER, null, msgs);
+				msgs = ((InternalEObject) imageBuffer).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER, null, msgs);
 			if (newImageBuffer != null)
-				msgs = ((InternalEObject)newImageBuffer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER, null, msgs);
+				msgs = ((InternalEObject) newImageBuffer).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER, null, msgs);
 			msgs = basicSetImageBuffer(newImageBuffer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER, newImageBuffer, newImageBuffer));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER,
+					newImageBuffer, newImageBuffer));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
-				return basicSetCropBound(null, msgs);
-			case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
-				return basicSetImageBuffer(null, msgs);
+		case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
+			return basicSetCropBound(null, msgs);
+		case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
+			return basicSetImageBuffer(null, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_BUFFER_STYLE__ANTI_ALIAS:
-				return getAntiAlias();
-			case NotationPackage.IMAGE_BUFFER_STYLE__MAINTAIN_ASPECT_RATIO:
-				return getMaintainAspectRatio();
-			case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
-				return getCropBound();
-			case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
-				return getImageBuffer();
+		case NotationPackage.IMAGE_BUFFER_STYLE__ANTI_ALIAS:
+			return getAntiAlias();
+		case NotationPackage.IMAGE_BUFFER_STYLE__MAINTAIN_ASPECT_RATIO:
+			return getMaintainAspectRatio();
+		case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
+			return getCropBound();
+		case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
+			return getImageBuffer();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_BUFFER_STYLE__ANTI_ALIAS:
-				setAntiAlias((Boolean)newValue);
-				return;
-			case NotationPackage.IMAGE_BUFFER_STYLE__MAINTAIN_ASPECT_RATIO:
-				setMaintainAspectRatio((Boolean)newValue);
-				return;
-			case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
-				setCropBound((Bounds)newValue);
-				return;
-			case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
-				setImageBuffer((Image)newValue);
-				return;
+		case NotationPackage.IMAGE_BUFFER_STYLE__ANTI_ALIAS:
+			setAntiAlias((Boolean) newValue);
+			return;
+		case NotationPackage.IMAGE_BUFFER_STYLE__MAINTAIN_ASPECT_RATIO:
+			setMaintainAspectRatio((Boolean) newValue);
+			return;
+		case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
+			setCropBound((Bounds) newValue);
+			return;
+		case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
+			setImageBuffer((Image) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_BUFFER_STYLE__ANTI_ALIAS:
-				setAntiAlias(ANTI_ALIAS_EDEFAULT);
-				return;
-			case NotationPackage.IMAGE_BUFFER_STYLE__MAINTAIN_ASPECT_RATIO:
-				setMaintainAspectRatio(MAINTAIN_ASPECT_RATIO_EDEFAULT);
-				return;
-			case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
-				setCropBound((Bounds)null);
-				return;
-			case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
-				setImageBuffer((Image)null);
-				return;
+		case NotationPackage.IMAGE_BUFFER_STYLE__ANTI_ALIAS:
+			setAntiAlias(ANTI_ALIAS_EDEFAULT);
+			return;
+		case NotationPackage.IMAGE_BUFFER_STYLE__MAINTAIN_ASPECT_RATIO:
+			setMaintainAspectRatio(MAINTAIN_ASPECT_RATIO_EDEFAULT);
+			return;
+		case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
+			setCropBound((Bounds) null);
+			return;
+		case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
+			setImageBuffer((Image) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_BUFFER_STYLE__ANTI_ALIAS:
-				return ANTI_ALIAS_EDEFAULT == null ? antiAlias != null : !ANTI_ALIAS_EDEFAULT.equals(antiAlias);
-			case NotationPackage.IMAGE_BUFFER_STYLE__MAINTAIN_ASPECT_RATIO:
-				return MAINTAIN_ASPECT_RATIO_EDEFAULT == null ? maintainAspectRatio != null : !MAINTAIN_ASPECT_RATIO_EDEFAULT.equals(maintainAspectRatio);
-			case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
-				return cropBound != null;
-			case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
-				return imageBuffer != null;
+		case NotationPackage.IMAGE_BUFFER_STYLE__ANTI_ALIAS:
+			return ANTI_ALIAS_EDEFAULT == null ? antiAlias != null : !ANTI_ALIAS_EDEFAULT.equals(antiAlias);
+		case NotationPackage.IMAGE_BUFFER_STYLE__MAINTAIN_ASPECT_RATIO:
+			return MAINTAIN_ASPECT_RATIO_EDEFAULT == null ? maintainAspectRatio != null
+					: !MAINTAIN_ASPECT_RATIO_EDEFAULT.equals(maintainAspectRatio);
+		case NotationPackage.IMAGE_BUFFER_STYLE__CROP_BOUND:
+			return cropBound != null;
+		case NotationPackage.IMAGE_BUFFER_STYLE__IMAGE_BUFFER:
+			return imageBuffer != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //ImageBufferStyleImpl
+} // ImageBufferStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageImpl.java
index 29815ec..cd75485 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageImpl.java
@@ -20,15 +20,15 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Image</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Image</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageImpl#getData <em>Data</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageImpl#getData
+ * <em>Data</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -36,56 +36,56 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class ImageImpl extends MinimalEObjectImpl.Container implements Image {
-    /**
-	 * The default value of the '{@link #getData() <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getData() <em>Data</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getData()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final byte[] DATA_EDEFAULT = null;
 
-    /**
-	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getData()
 	 * @generated
 	 * @ordered
 	 */
 	protected byte[] data = DATA_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.IMAGE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public byte[] getData() {
 		return data;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setData(byte[] newData) {
@@ -95,67 +95,68 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE__DATA, oldData, data));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.IMAGE__DATA:
-				return getData();
+		case NotationPackage.IMAGE__DATA:
+			return getData();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.IMAGE__DATA:
-				setData((byte[])newValue);
-				return;
+		case NotationPackage.IMAGE__DATA:
+			setData((byte[]) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.IMAGE__DATA:
-				setData(DATA_EDEFAULT);
-				return;
+		case NotationPackage.IMAGE__DATA:
+			setData(DATA_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.IMAGE__DATA:
-				return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
+		case NotationPackage.IMAGE__DATA:
+			return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (data: "); //$NON-NLS-1$
@@ -164,4 +165,4 @@
 		return result.toString();
 	}
 
-} //ImageImpl
+} // ImageImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageStyleImpl.java
index e30b3bc..40967e6 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ImageStyleImpl.java
@@ -23,17 +23,19 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Image Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Image
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl#getAntiAlias <em>Anti Alias</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl#getMaintainAspectRatio <em>Maintain Aspect Ratio</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl#getCropBound <em>Crop Bound</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl#getAntiAlias
+ * <em>Anti Alias</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl#getMaintainAspectRatio
+ * <em>Maintain Aspect Ratio</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl#getCropBound
+ * <em>Crop Bound</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -41,253 +43,264 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class ImageStyleImpl extends MinimalEObjectImpl.Container implements ImageStyle {
-    /**
-	 * The default value of the '{@link #getAntiAlias() <em>Anti Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getAntiAlias() <em>Anti Alias</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAntiAlias()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final Boolean ANTI_ALIAS_EDEFAULT = Boolean.TRUE;
 
-    /**
-	 * The cached value of the '{@link #getAntiAlias() <em>Anti Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getAntiAlias() <em>Anti Alias</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAntiAlias()
 	 * @generated
 	 * @ordered
 	 */
 	protected Boolean antiAlias = ANTI_ALIAS_EDEFAULT;
 
-				/**
-	 * The default value of the '{@link #getMaintainAspectRatio() <em>Maintain Aspect Ratio</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getMaintainAspectRatio() <em>Maintain
+	 * Aspect Ratio</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMaintainAspectRatio()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final Boolean MAINTAIN_ASPECT_RATIO_EDEFAULT = Boolean.TRUE;
 
-    /**
-	 * The cached value of the '{@link #getMaintainAspectRatio() <em>Maintain Aspect Ratio</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getMaintainAspectRatio() <em>Maintain Aspect
+	 * Ratio</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMaintainAspectRatio()
 	 * @generated
 	 * @ordered
 	 */
 	protected Boolean maintainAspectRatio = MAINTAIN_ASPECT_RATIO_EDEFAULT;
 
-				/**
-	 * The cached value of the '{@link #getCropBound() <em>Crop Bound</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getCropBound() <em>Crop Bound</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCropBound()
 	 * @generated
 	 * @ordered
 	 */
 	protected Bounds cropBound;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.IMAGE_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Boolean getAntiAlias() {
 		return antiAlias;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAntiAlias(Boolean newAntiAlias) {
 		Boolean oldAntiAlias = antiAlias;
 		antiAlias = newAntiAlias;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_STYLE__ANTI_ALIAS, oldAntiAlias, antiAlias));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_STYLE__ANTI_ALIAS, oldAntiAlias,
+					antiAlias));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Boolean getMaintainAspectRatio() {
 		return maintainAspectRatio;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMaintainAspectRatio(Boolean newMaintainAspectRatio) {
 		Boolean oldMaintainAspectRatio = maintainAspectRatio;
 		maintainAspectRatio = newMaintainAspectRatio;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO, oldMaintainAspectRatio, maintainAspectRatio));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO,
+					oldMaintainAspectRatio, maintainAspectRatio));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds getCropBound() {
 		return cropBound;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCropBound(Bounds newCropBound, NotificationChain msgs) {
 		Bounds oldCropBound = cropBound;
 		cropBound = newCropBound;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_STYLE__CROP_BOUND, oldCropBound, newCropBound);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.IMAGE_STYLE__CROP_BOUND, oldCropBound, newCropBound);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCropBound(Bounds newCropBound) {
 		if (newCropBound != cropBound) {
 			NotificationChain msgs = null;
 			if (cropBound != null)
-				msgs = ((InternalEObject)cropBound).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.IMAGE_STYLE__CROP_BOUND, null, msgs);
+				msgs = ((InternalEObject) cropBound).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.IMAGE_STYLE__CROP_BOUND, null, msgs);
 			if (newCropBound != null)
-				msgs = ((InternalEObject)newCropBound).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.IMAGE_STYLE__CROP_BOUND, null, msgs);
+				msgs = ((InternalEObject) newCropBound).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.IMAGE_STYLE__CROP_BOUND, null, msgs);
 			msgs = basicSetCropBound(newCropBound, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_STYLE__CROP_BOUND, newCropBound, newCropBound));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.IMAGE_STYLE__CROP_BOUND, newCropBound,
+					newCropBound));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_STYLE__CROP_BOUND:
-				return basicSetCropBound(null, msgs);
+		case NotationPackage.IMAGE_STYLE__CROP_BOUND:
+			return basicSetCropBound(null, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_STYLE__ANTI_ALIAS:
-				return getAntiAlias();
-			case NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO:
-				return getMaintainAspectRatio();
-			case NotationPackage.IMAGE_STYLE__CROP_BOUND:
-				return getCropBound();
+		case NotationPackage.IMAGE_STYLE__ANTI_ALIAS:
+			return getAntiAlias();
+		case NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO:
+			return getMaintainAspectRatio();
+		case NotationPackage.IMAGE_STYLE__CROP_BOUND:
+			return getCropBound();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_STYLE__ANTI_ALIAS:
-				setAntiAlias((Boolean)newValue);
-				return;
-			case NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO:
-				setMaintainAspectRatio((Boolean)newValue);
-				return;
-			case NotationPackage.IMAGE_STYLE__CROP_BOUND:
-				setCropBound((Bounds)newValue);
-				return;
+		case NotationPackage.IMAGE_STYLE__ANTI_ALIAS:
+			setAntiAlias((Boolean) newValue);
+			return;
+		case NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO:
+			setMaintainAspectRatio((Boolean) newValue);
+			return;
+		case NotationPackage.IMAGE_STYLE__CROP_BOUND:
+			setCropBound((Bounds) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_STYLE__ANTI_ALIAS:
-				setAntiAlias(ANTI_ALIAS_EDEFAULT);
-				return;
-			case NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO:
-				setMaintainAspectRatio(MAINTAIN_ASPECT_RATIO_EDEFAULT);
-				return;
-			case NotationPackage.IMAGE_STYLE__CROP_BOUND:
-				setCropBound((Bounds)null);
-				return;
+		case NotationPackage.IMAGE_STYLE__ANTI_ALIAS:
+			setAntiAlias(ANTI_ALIAS_EDEFAULT);
+			return;
+		case NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO:
+			setMaintainAspectRatio(MAINTAIN_ASPECT_RATIO_EDEFAULT);
+			return;
+		case NotationPackage.IMAGE_STYLE__CROP_BOUND:
+			setCropBound((Bounds) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.IMAGE_STYLE__ANTI_ALIAS:
-				return ANTI_ALIAS_EDEFAULT == null ? antiAlias != null : !ANTI_ALIAS_EDEFAULT.equals(antiAlias);
-			case NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO:
-				return MAINTAIN_ASPECT_RATIO_EDEFAULT == null ? maintainAspectRatio != null : !MAINTAIN_ASPECT_RATIO_EDEFAULT.equals(maintainAspectRatio);
-			case NotationPackage.IMAGE_STYLE__CROP_BOUND:
-				return cropBound != null;
+		case NotationPackage.IMAGE_STYLE__ANTI_ALIAS:
+			return ANTI_ALIAS_EDEFAULT == null ? antiAlias != null : !ANTI_ALIAS_EDEFAULT.equals(antiAlias);
+		case NotationPackage.IMAGE_STYLE__MAINTAIN_ASPECT_RATIO:
+			return MAINTAIN_ASPECT_RATIO_EDEFAULT == null ? maintainAspectRatio != null
+					: !MAINTAIN_ASPECT_RATIO_EDEFAULT.equals(maintainAspectRatio);
+		case NotationPackage.IMAGE_STYLE__CROP_BOUND:
+			return cropBound != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (antiAlias: "); //$NON-NLS-1$
@@ -298,4 +311,4 @@
 		return result.toString();
 	}
 
-} //ImageStyleImpl
+} // ImageStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IntListValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IntListValueStyleImpl.java
index 49ada98..f08a24f 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IntListValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IntListValueStyleImpl.java
@@ -20,23 +20,23 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Int List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Int
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl#getIntListValue <em>Int List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl#getIntListValue
+ * <em>Int List Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValueStyle {
 	/**
-	 * The cached value of the '{@link #getIntListValue() <em>Int List Value</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getIntListValue() <em>Int List Value</em>}'
+	 * attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getIntListValue()
 	 * @generated
 	 * @ordered
@@ -44,8 +44,8 @@
 	protected EList intListValue;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IntListValueStyleImpl() {
@@ -53,8 +53,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -62,89 +62,91 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getIntListValue() {
 		if (intListValue == null) {
-			intListValue = new EDataTypeEList(Integer.class, this, NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE);
+			intListValue = new EDataTypeEList(Integer.class, this,
+					NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE);
 		}
 		return intListValue;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.INT_LIST_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
-				return getIntListValue();
+		case NotationPackage.INT_LIST_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+			return getIntListValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.INT_LIST_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
-				getIntListValue().clear();
-				getIntListValue().addAll((Collection)newValue);
-				return;
+		case NotationPackage.INT_LIST_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+			getIntListValue().clear();
+			getIntListValue().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.INT_LIST_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
-				getIntListValue().clear();
-				return;
+		case NotationPackage.INT_LIST_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+			getIntListValue().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.INT_LIST_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
-				return intListValue != null && !intListValue.isEmpty();
+		case NotationPackage.INT_LIST_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+			return intListValue != null && !intListValue.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (intListValue: "); //$NON-NLS-1$
@@ -153,4 +155,4 @@
 		return result.toString();
 	}
 
-} //IntListValueStyleImpl
+} // IntListValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IntValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IntValueStyleImpl.java
index 9663659..370458c 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IntValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/IntValueStyleImpl.java
@@ -12,32 +12,29 @@
 package org.eclipse.gmf.runtime.notation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.IntValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Int Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Int
+ * Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl#getIntValue <em>Int Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl#getIntValue
+ * <em>Int Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**
-	 * The default value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getIntValue() <em>Int Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getIntValue()
 	 * @generated
 	 * @ordered
@@ -45,9 +42,9 @@
 	protected static final int INT_VALUE_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getIntValue() <em>Int Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getIntValue()
 	 * @generated
 	 * @ordered
@@ -55,8 +52,8 @@
 	protected int intValue = INT_VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IntValueStyleImpl() {
@@ -64,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -73,8 +70,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getIntValue() {
@@ -82,88 +79,90 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIntValue(int newIntValue) {
 		int oldIntValue = intValue;
 		intValue = newIntValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.INT_VALUE_STYLE__INT_VALUE, oldIntValue, intValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.INT_VALUE_STYLE__INT_VALUE,
+					oldIntValue, intValue));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.INT_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.INT_VALUE_STYLE__INT_VALUE:
-				return new Integer(getIntValue());
+		case NotationPackage.INT_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.INT_VALUE_STYLE__INT_VALUE:
+			return new Integer(getIntValue());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.INT_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.INT_VALUE_STYLE__INT_VALUE:
-				setIntValue(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.INT_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.INT_VALUE_STYLE__INT_VALUE:
+			setIntValue(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.INT_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.INT_VALUE_STYLE__INT_VALUE:
-				setIntValue(INT_VALUE_EDEFAULT);
-				return;
+		case NotationPackage.INT_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.INT_VALUE_STYLE__INT_VALUE:
+			setIntValue(INT_VALUE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.INT_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.INT_VALUE_STYLE__INT_VALUE:
-				return intValue != INT_VALUE_EDEFAULT;
+		case NotationPackage.INT_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.INT_VALUE_STYLE__INT_VALUE:
+			return intValue != INT_VALUE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (intValue: "); //$NON-NLS-1$
@@ -172,4 +171,4 @@
 		return result.toString();
 	}
 
-} //IntValueStyleImpl
+} // IntValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LineStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LineStyleImpl.java
index 819804f..294a3ec 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LineStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LineStyleImpl.java
@@ -20,16 +20,17 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Line Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Line
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.LineStyleImpl#getLineColor <em>Line Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.LineStyleImpl#getLineWidth <em>Line Width</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.LineStyleImpl#getLineColor
+ * <em>Line Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.LineStyleImpl#getLineWidth
+ * <em>Line Width</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -37,177 +38,180 @@
  * @canBeSeenBy %partners
  */
 public class LineStyleImpl extends MinimalEObjectImpl.Container implements LineStyle {
-    /**
-	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int LINE_COLOR_EDEFAULT = 11579568;
 
-    /**
-	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected int lineColor = LINE_COLOR_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int LINE_WIDTH_EDEFAULT = -1;
 
-				/**
-	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected int lineWidth = LINE_WIDTH_EDEFAULT;
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.LINE_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineColor() {
 		return lineColor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineColor(int newLineColor) {
 		int oldLineColor = lineColor;
 		lineColor = newLineColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LINE_STYLE__LINE_COLOR, oldLineColor, lineColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LINE_STYLE__LINE_COLOR, oldLineColor,
+					lineColor));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineWidth() {
 		return lineWidth;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineWidth(int newLineWidth) {
 		int oldLineWidth = lineWidth;
 		lineWidth = newLineWidth;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LINE_STYLE__LINE_WIDTH, oldLineWidth, lineWidth));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LINE_STYLE__LINE_WIDTH, oldLineWidth,
+					lineWidth));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.LINE_STYLE__LINE_COLOR:
-				return new Integer(getLineColor());
-			case NotationPackage.LINE_STYLE__LINE_WIDTH:
-				return new Integer(getLineWidth());
+		case NotationPackage.LINE_STYLE__LINE_COLOR:
+			return new Integer(getLineColor());
+		case NotationPackage.LINE_STYLE__LINE_WIDTH:
+			return new Integer(getLineWidth());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.LINE_STYLE__LINE_COLOR:
-				setLineColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.LINE_STYLE__LINE_WIDTH:
-				setLineWidth(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.LINE_STYLE__LINE_COLOR:
+			setLineColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.LINE_STYLE__LINE_WIDTH:
+			setLineWidth(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LINE_STYLE__LINE_COLOR:
-				setLineColor(LINE_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.LINE_STYLE__LINE_WIDTH:
-				setLineWidth(LINE_WIDTH_EDEFAULT);
-				return;
+		case NotationPackage.LINE_STYLE__LINE_COLOR:
+			setLineColor(LINE_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.LINE_STYLE__LINE_WIDTH:
+			setLineWidth(LINE_WIDTH_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LINE_STYLE__LINE_COLOR:
-				return lineColor != LINE_COLOR_EDEFAULT;
-			case NotationPackage.LINE_STYLE__LINE_WIDTH:
-				return lineWidth != LINE_WIDTH_EDEFAULT;
+		case NotationPackage.LINE_STYLE__LINE_COLOR:
+			return lineColor != LINE_COLOR_EDEFAULT;
+		case NotationPackage.LINE_STYLE__LINE_WIDTH:
+			return lineWidth != LINE_WIDTH_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (lineColor: "); //$NON-NLS-1$
@@ -218,4 +222,4 @@
 		return result.toString();
 	}
 
-} //LineStyleImpl
+} // LineStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LineTypeStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LineTypeStyleImpl.java
index 0201022..9e22b3c 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LineTypeStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LineTypeStyleImpl.java
@@ -20,30 +20,31 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Line Type Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Line
+ * Type Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl#getLineType <em>Line Type</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl#getLineType
+ * <em>Line Type</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class LineTypeStyleImpl extends MinimalEObjectImpl.Container implements LineTypeStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
+
 	/**
-	 * The default value of the '{@link #getLineType() <em>Line Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLineType() <em>Line Type</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineType()
 	 * @generated
 	 * @ordered
@@ -51,36 +52,38 @@
 	protected static final LineType LINE_TYPE_EDEFAULT = LineType.SOLID_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getLineType() <em>Line Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the '{@link #getLineType()
+	 * <em>Line Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int LINE_TYPE_EFLAG_OFFSET = 8;
 
 	/**
-	 * The flags representing the default value of the '{@link #getLineType() <em>Line Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getLineType()
+	 * <em>Line Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int LINE_TYPE_EFLAG_DEFAULT = LineType.VALUES.indexOf(LINE_TYPE_EDEFAULT) << LINE_TYPE_EFLAG_OFFSET;
+	protected static final int LINE_TYPE_EFLAG_DEFAULT = LineType.VALUES
+			.indexOf(LINE_TYPE_EDEFAULT) << LINE_TYPE_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link LineType Line Type}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link LineType Line Type}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final LineType[] LINE_TYPE_EFLAG_VALUES = (LineType[])LineType.VALUES.toArray(new LineType[LineType.VALUES.size()]);
+	private static final LineType[] LINE_TYPE_EFLAG_VALUES = (LineType[]) LineType.VALUES
+			.toArray(new LineType[LineType.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getLineType() <em>Line Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getLineType() <em>Line
+	 * Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineType()
 	 * @generated
 	 * @ordered
@@ -88,8 +91,8 @@
 	protected static final int LINE_TYPE_EFLAG = 0x7 << LINE_TYPE_EFLAG_OFFSET;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineTypeStyleImpl() {
@@ -97,8 +100,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -106,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LineType getLineType() {
@@ -115,79 +118,82 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineType(LineType newLineType) {
 		LineType oldLineType = LINE_TYPE_EFLAG_VALUES[(eFlags & LINE_TYPE_EFLAG) >>> LINE_TYPE_EFLAG_OFFSET];
-		if (newLineType == null) newLineType = LINE_TYPE_EDEFAULT;
+		if (newLineType == null)
+			newLineType = LINE_TYPE_EDEFAULT;
 		eFlags = eFlags & ~LINE_TYPE_EFLAG | LineType.VALUES.indexOf(newLineType) << LINE_TYPE_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LINE_TYPE_STYLE__LINE_TYPE, oldLineType, newLineType));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LINE_TYPE_STYLE__LINE_TYPE,
+					oldLineType, newLineType));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.LINE_TYPE_STYLE__LINE_TYPE:
-				return getLineType();
+		case NotationPackage.LINE_TYPE_STYLE__LINE_TYPE:
+			return getLineType();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.LINE_TYPE_STYLE__LINE_TYPE:
-				setLineType((LineType)newValue);
-				return;
+		case NotationPackage.LINE_TYPE_STYLE__LINE_TYPE:
+			setLineType((LineType) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LINE_TYPE_STYLE__LINE_TYPE:
-				setLineType(LINE_TYPE_EDEFAULT);
-				return;
+		case NotationPackage.LINE_TYPE_STYLE__LINE_TYPE:
+			setLineType(LINE_TYPE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LINE_TYPE_STYLE__LINE_TYPE:
-				return (eFlags & LINE_TYPE_EFLAG) != LINE_TYPE_EFLAG_DEFAULT;
+		case NotationPackage.LINE_TYPE_STYLE__LINE_TYPE:
+			return (eFlags & LINE_TYPE_EFLAG) != LINE_TYPE_EFLAG_DEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (lineType: "); //$NON-NLS-1$
@@ -196,4 +202,4 @@
 		return result.toString();
 	}
 
-} //LineTypeStyleImpl
+} // LineTypeStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ListCompartmentImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ListCompartmentImpl.java
index 828b3b1..c9b9600 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ListCompartmentImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ListCompartmentImpl.java
@@ -17,16 +17,11 @@
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.gmf.runtime.notation.Filtering;
 import org.eclipse.gmf.runtime.notation.FilteringStyle;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;
@@ -37,21 +32,27 @@
 import org.eclipse.gmf.runtime.notation.TitleStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>List Compartment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>List
+ * Compartment</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getSorting <em>Sorting</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getSortingKeys <em>Sorting Keys</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getSortedObjects <em>Sorted Objects</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getFiltering <em>Filtering</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getFilteringKeys <em>Filtering Keys</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getFilteredObjects <em>Filtered Objects</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#isShowTitle <em>Show Title</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getSorting
+ * <em>Sorting</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getSortingKeys
+ * <em>Sorting Keys</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getSortedObjects
+ * <em>Sorted Objects</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getFiltering
+ * <em>Filtering</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getFilteringKeys
+ * <em>Filtering Keys</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#getFilteredObjects
+ * <em>Filtered Objects</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl#isShowTitle
+ * <em>Show Title</em>}</li>
+ * </ul>
  *
  * @generated
  * @since 1.2
@@ -59,8 +60,8 @@
 public class ListCompartmentImpl extends BasicCompartmentImpl implements ListCompartment {
 	/**
 	 * The default value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSorting()
 	 * @generated
 	 * @ordered
@@ -68,36 +69,37 @@
 	protected static final Sorting SORTING_EDEFAULT = Sorting.NONE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SORTING_EFLAG_OFFSET = 12;
 
 	/**
-	 * The flags representing the default value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SORTING_EFLAG_DEFAULT = Sorting.VALUES.indexOf(SORTING_EDEFAULT) << SORTING_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link Sorting Sorting}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link Sorting Sorting}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Sorting[] SORTING_EFLAG_VALUES = (Sorting[])Sorting.VALUES.toArray(new Sorting[Sorting.VALUES.size()]);
+	private static final Sorting[] SORTING_EFLAG_VALUES = (Sorting[]) Sorting.VALUES
+			.toArray(new Sorting[Sorting.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSorting()
 	 * @generated
 	 * @ordered
@@ -105,9 +107,9 @@
 	protected static final int SORTING_EFLAG = 0x3 << SORTING_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortingKeys()
 	 * @generated NOT
 	 * @ordered
@@ -115,9 +117,9 @@
 	protected static final Map SORTING_KEYS_EDEFAULT = Collections.EMPTY_MAP;
 
 	/**
-	 * The cached value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortingKeys()
 	 * @generated
 	 * @ordered
@@ -125,9 +127,9 @@
 	protected Map sortingKeys = SORTING_KEYS_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getSortedObjects() <em>Sorted Objects</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSortedObjects() <em>Sorted Objects</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortedObjects()
 	 * @generated
 	 * @ordered
@@ -135,9 +137,9 @@
 	protected EList sortedObjects;
 
 	/**
-	 * The default value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFiltering() <em>Filtering</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFiltering()
 	 * @generated
 	 * @ordered
@@ -145,36 +147,38 @@
 	protected static final Filtering FILTERING_EDEFAULT = Filtering.NONE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int FILTERING_EFLAG_OFFSET = 14;
 
 	/**
-	 * The flags representing the default value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int FILTERING_EFLAG_DEFAULT = Filtering.VALUES.indexOf(FILTERING_EDEFAULT) << FILTERING_EFLAG_OFFSET;
+	protected static final int FILTERING_EFLAG_DEFAULT = Filtering.VALUES
+			.indexOf(FILTERING_EDEFAULT) << FILTERING_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link Filtering Filtering}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link Filtering Filtering}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Filtering[] FILTERING_EFLAG_VALUES = (Filtering[])Filtering.VALUES.toArray(new Filtering[Filtering.VALUES.size()]);
+	private static final Filtering[] FILTERING_EFLAG_VALUES = (Filtering[]) Filtering.VALUES
+			.toArray(new Filtering[Filtering.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFiltering()
 	 * @generated
 	 * @ordered
@@ -182,9 +186,9 @@
 	protected static final int FILTERING_EFLAG = 0x3 << FILTERING_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFilteringKeys() <em>Filtering
+	 * Keys</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteringKeys()
 	 * @generated NOT
 	 * @ordered
@@ -192,9 +196,9 @@
 	protected static final List FILTERING_KEYS_EDEFAULT = Collections.EMPTY_LIST;
 
 	/**
-	 * The cached value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteringKeys()
 	 * @generated
 	 * @ordered
@@ -202,9 +206,9 @@
 	protected List filteringKeys = FILTERING_KEYS_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getFilteredObjects() <em>Filtered Objects</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilteredObjects() <em>Filtered
+	 * Objects</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteredObjects()
 	 * @generated
 	 * @ordered
@@ -212,9 +216,9 @@
 	protected EList filteredObjects;
 
 	/**
-	 * The default value of the '{@link #isShowTitle() <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isShowTitle() <em>Show Title</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isShowTitle()
 	 * @generated
 	 * @ordered
@@ -222,9 +226,9 @@
 	protected static final boolean SHOW_TITLE_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isShowTitle() <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isShowTitle() <em>Show
+	 * Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isShowTitle()
 	 * @generated
 	 * @ordered
@@ -232,8 +236,8 @@
 	protected static final int SHOW_TITLE_EFLAG = 1 << 16;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ListCompartmentImpl() {
@@ -241,8 +245,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -250,8 +254,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Sorting getSorting() {
@@ -259,21 +263,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSorting(Sorting newSorting) {
 		Sorting oldSorting = SORTING_EFLAG_VALUES[(eFlags & SORTING_EFLAG) >>> SORTING_EFLAG_OFFSET];
-		if (newSorting == null) newSorting = SORTING_EDEFAULT;
+		if (newSorting == null)
+			newSorting = SORTING_EDEFAULT;
 		eFlags = eFlags & ~SORTING_EFLAG | Sorting.VALUES.indexOf(newSorting) << SORTING_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__SORTING, oldSorting, newSorting));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__SORTING, oldSorting,
+					newSorting));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Map getSortingKeys() {
@@ -281,32 +287,34 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSortingKeys(Map newSortingKeys) {
 		Map oldSortingKeys = sortingKeys;
 		sortingKeys = newSortingKeys;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__SORTING_KEYS, oldSortingKeys, sortingKeys));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__SORTING_KEYS,
+					oldSortingKeys, sortingKeys));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getSortedObjects() {
 		if (sortedObjects == null) {
-			sortedObjects = new EObjectResolvingEList(EObject.class, this, NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS);
+			sortedObjects = new EObjectResolvingEList(EObject.class, this,
+					NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS);
 		}
 		return sortedObjects;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Filtering getFiltering() {
@@ -314,21 +322,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFiltering(Filtering newFiltering) {
 		Filtering oldFiltering = FILTERING_EFLAG_VALUES[(eFlags & FILTERING_EFLAG) >>> FILTERING_EFLAG_OFFSET];
-		if (newFiltering == null) newFiltering = FILTERING_EDEFAULT;
+		if (newFiltering == null)
+			newFiltering = FILTERING_EDEFAULT;
 		eFlags = eFlags & ~FILTERING_EFLAG | Filtering.VALUES.indexOf(newFiltering) << FILTERING_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__FILTERING, oldFiltering, newFiltering));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__FILTERING,
+					oldFiltering, newFiltering));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List getFilteringKeys() {
@@ -336,32 +346,34 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFilteringKeys(List newFilteringKeys) {
 		List oldFilteringKeys = filteringKeys;
 		filteringKeys = newFilteringKeys;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS, oldFilteringKeys, filteringKeys));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS,
+					oldFilteringKeys, filteringKeys));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getFilteredObjects() {
 		if (filteredObjects == null) {
-			filteredObjects = new EObjectResolvingEList(EObject.class, this, NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS);
+			filteredObjects = new EObjectResolvingEList(EObject.class, this,
+					NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS);
 		}
 		return filteredObjects;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isShowTitle() {
@@ -369,377 +381,406 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setShowTitle(boolean newShowTitle) {
 		boolean oldShowTitle = (eFlags & SHOW_TITLE_EFLAG) != 0;
-		if (newShowTitle) eFlags |= SHOW_TITLE_EFLAG; else eFlags &= ~SHOW_TITLE_EFLAG;
+		if (newShowTitle)
+			eFlags |= SHOW_TITLE_EFLAG;
+		else
+			eFlags &= ~SHOW_TITLE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__SHOW_TITLE, oldShowTitle, newShowTitle));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LIST_COMPARTMENT__SHOW_TITLE,
+					oldShowTitle, newShowTitle));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.LIST_COMPARTMENT__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.LIST_COMPARTMENT__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.LIST_COMPARTMENT__TYPE:
-				return getType();
-			case NotationPackage.LIST_COMPARTMENT__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.LIST_COMPARTMENT__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.LIST_COMPARTMENT__STYLES:
-				return getStyles();
-			case NotationPackage.LIST_COMPARTMENT__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.LIST_COMPARTMENT__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
-			case NotationPackage.LIST_COMPARTMENT__COLLAPSED:
-				return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.LIST_COMPARTMENT__SORTING:
-				return getSorting();
-			case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
-				return getSortingKeys();
-			case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
-				return getSortedObjects();
-			case NotationPackage.LIST_COMPARTMENT__FILTERING:
-				return getFiltering();
-			case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
-				return getFilteringKeys();
-			case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
-				return getFilteredObjects();
-			case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
-				return isShowTitle() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.LIST_COMPARTMENT__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.LIST_COMPARTMENT__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.LIST_COMPARTMENT__TYPE:
+			return getType();
+		case NotationPackage.LIST_COMPARTMENT__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.LIST_COMPARTMENT__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.LIST_COMPARTMENT__STYLES:
+			return getStyles();
+		case NotationPackage.LIST_COMPARTMENT__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.LIST_COMPARTMENT__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
+		case NotationPackage.LIST_COMPARTMENT__COLLAPSED:
+			return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.LIST_COMPARTMENT__SORTING:
+			return getSorting();
+		case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
+			return getSortingKeys();
+		case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
+			return getSortedObjects();
+		case NotationPackage.LIST_COMPARTMENT__FILTERING:
+			return getFiltering();
+		case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
+			return getFilteringKeys();
+		case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
+			return getFilteredObjects();
+		case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
+			return isShowTitle() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
-				return;
-			default:
-				eSetGen(featureID, newValue);
+		case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
+			return;
+		default:
+			eSetGen(featureID, newValue);
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSetGen(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.LIST_COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.LIST_COMPARTMENT__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__COLLAPSED:
-				setCollapsed(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SORTING:
-				setSorting((Sorting)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
-				setSortingKeys((Map)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
-				getSortedObjects().clear();
-				getSortedObjects().addAll((Collection)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__FILTERING:
-				setFiltering((Filtering)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
-				setFilteringKeys((List)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
-				getFilteredObjects().clear();
-				getFilteredObjects().addAll((Collection)newValue);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
-				setShowTitle(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.LIST_COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.LIST_COMPARTMENT__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__COLLAPSED:
+			setCollapsed(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SORTING:
+			setSorting((Sorting) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
+			setSortingKeys((Map) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
+			getSortedObjects().clear();
+			getSortedObjects().addAll((Collection) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__FILTERING:
+			setFiltering((Filtering) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
+			setFilteringKeys((List) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
+			getFilteredObjects().clear();
+			getFilteredObjects().addAll((Collection) newValue);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
+			setShowTitle(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
-				return;
-			default:
-				eUnsetGen(featureID);
+		case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
+			return;
+		default:
+			eUnsetGen(featureID);
 		}
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnsetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LIST_COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)null);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__COLLAPSED:
-				setCollapsed(COLLAPSED_EDEFAULT);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SORTING:
-				setSorting(SORTING_EDEFAULT);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
-				setSortingKeys(SORTING_KEYS_EDEFAULT);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
-				getSortedObjects().clear();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__FILTERING:
-				setFiltering(FILTERING_EDEFAULT);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
-				setFilteringKeys(FILTERING_KEYS_EDEFAULT);
-				return;
-			case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
-				getFilteredObjects().clear();
-				return;
-			case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
-				setShowTitle(SHOW_TITLE_EDEFAULT);
-				return;
+		case NotationPackage.LIST_COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) null);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__COLLAPSED:
+			setCollapsed(COLLAPSED_EDEFAULT);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SORTING:
+			setSorting(SORTING_EDEFAULT);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
+			setSortingKeys(SORTING_KEYS_EDEFAULT);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
+			getSortedObjects().clear();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__FILTERING:
+			setFiltering(FILTERING_EDEFAULT);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
+			setFilteringKeys(FILTERING_KEYS_EDEFAULT);
+			return;
+		case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
+			getFilteredObjects().clear();
+			return;
+		case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
+			setShowTitle(SHOW_TITLE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
-				return false;
-			default:
-				return eIsSetGen(featureID);
+		case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
+			return false;
+		default:
+			return eIsSetGen(featureID);
 		}
 	}
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT_CDO
 	 */
 	public boolean eIsSetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LIST_COMPARTMENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.LIST_COMPARTMENT__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.LIST_COMPARTMENT__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.LIST_COMPARTMENT__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
-				return false;
-			case NotationPackage.LIST_COMPARTMENT__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.LIST_COMPARTMENT__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.LIST_COMPARTMENT__ELEMENT:
-				return isSetElement();
-			case NotationPackage.LIST_COMPARTMENT__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return layoutConstraint != null;
-			case NotationPackage.LIST_COMPARTMENT__COLLAPSED:
-				return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
-			case NotationPackage.LIST_COMPARTMENT__SORTING:
-				return (eFlags & SORTING_EFLAG) != SORTING_EFLAG_DEFAULT;
-			case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
-				return SORTING_KEYS_EDEFAULT == null ? sortingKeys != null : !SORTING_KEYS_EDEFAULT.equals(sortingKeys);
-			case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
-				return sortedObjects != null && !sortedObjects.isEmpty();
-			case NotationPackage.LIST_COMPARTMENT__FILTERING:
-				return (eFlags & FILTERING_EFLAG) != FILTERING_EFLAG_DEFAULT;
-			case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
-				return FILTERING_KEYS_EDEFAULT == null ? filteringKeys != null : !FILTERING_KEYS_EDEFAULT.equals(filteringKeys);
-			case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
-				return filteredObjects != null && !filteredObjects.isEmpty();
-			case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
-				return ((eFlags & SHOW_TITLE_EFLAG) != 0) != SHOW_TITLE_EDEFAULT;
+		case NotationPackage.LIST_COMPARTMENT__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.LIST_COMPARTMENT__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.LIST_COMPARTMENT__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.LIST_COMPARTMENT__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.LIST_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.LIST_COMPARTMENT__TARGET_EDGES:
+			return false;
+		case NotationPackage.LIST_COMPARTMENT__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.LIST_COMPARTMENT__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.LIST_COMPARTMENT__ELEMENT:
+			return isSetElement();
+		case NotationPackage.LIST_COMPARTMENT__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return layoutConstraint != null;
+		case NotationPackage.LIST_COMPARTMENT__COLLAPSED:
+			return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
+		case NotationPackage.LIST_COMPARTMENT__SORTING:
+			return (eFlags & SORTING_EFLAG) != SORTING_EFLAG_DEFAULT;
+		case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
+			return SORTING_KEYS_EDEFAULT == null ? sortingKeys != null : !SORTING_KEYS_EDEFAULT.equals(sortingKeys);
+		case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
+			return sortedObjects != null && !sortedObjects.isEmpty();
+		case NotationPackage.LIST_COMPARTMENT__FILTERING:
+			return (eFlags & FILTERING_EFLAG) != FILTERING_EFLAG_DEFAULT;
+		case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
+			return FILTERING_KEYS_EDEFAULT == null ? filteringKeys != null
+					: !FILTERING_KEYS_EDEFAULT.equals(filteringKeys);
+		case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
+			return filteredObjects != null && !filteredObjects.isEmpty();
+		case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
+			return ((eFlags & SHOW_TITLE_EFLAG) != 0) != SHOW_TITLE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == SortingStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.LIST_COMPARTMENT__SORTING: return NotationPackage.SORTING_STYLE__SORTING;
-				case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS: return NotationPackage.SORTING_STYLE__SORTING_KEYS;
-				case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS: return NotationPackage.SORTING_STYLE__SORTED_OBJECTS;
-				default: return -1;
+			case NotationPackage.LIST_COMPARTMENT__SORTING:
+				return NotationPackage.SORTING_STYLE__SORTING;
+			case NotationPackage.LIST_COMPARTMENT__SORTING_KEYS:
+				return NotationPackage.SORTING_STYLE__SORTING_KEYS;
+			case NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS:
+				return NotationPackage.SORTING_STYLE__SORTED_OBJECTS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FilteringStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.LIST_COMPARTMENT__FILTERING: return NotationPackage.FILTERING_STYLE__FILTERING;
-				case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS: return NotationPackage.FILTERING_STYLE__FILTERING_KEYS;
-				case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS: return NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS;
-				default: return -1;
+			case NotationPackage.LIST_COMPARTMENT__FILTERING:
+				return NotationPackage.FILTERING_STYLE__FILTERING;
+			case NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS:
+				return NotationPackage.FILTERING_STYLE__FILTERING_KEYS;
+			case NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS:
+				return NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == TitleStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE: return NotationPackage.TITLE_STYLE__SHOW_TITLE;
-				default: return -1;
+			case NotationPackage.LIST_COMPARTMENT__SHOW_TITLE:
+				return NotationPackage.TITLE_STYLE__SHOW_TITLE;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == SortingStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.SORTING_STYLE__SORTING: return NotationPackage.LIST_COMPARTMENT__SORTING;
-				case NotationPackage.SORTING_STYLE__SORTING_KEYS: return NotationPackage.LIST_COMPARTMENT__SORTING_KEYS;
-				case NotationPackage.SORTING_STYLE__SORTED_OBJECTS: return NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS;
-				default: return -1;
+			case NotationPackage.SORTING_STYLE__SORTING:
+				return NotationPackage.LIST_COMPARTMENT__SORTING;
+			case NotationPackage.SORTING_STYLE__SORTING_KEYS:
+				return NotationPackage.LIST_COMPARTMENT__SORTING_KEYS;
+			case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
+				return NotationPackage.LIST_COMPARTMENT__SORTED_OBJECTS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FilteringStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.FILTERING_STYLE__FILTERING: return NotationPackage.LIST_COMPARTMENT__FILTERING;
-				case NotationPackage.FILTERING_STYLE__FILTERING_KEYS: return NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS;
-				case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS: return NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS;
-				default: return -1;
+			case NotationPackage.FILTERING_STYLE__FILTERING:
+				return NotationPackage.LIST_COMPARTMENT__FILTERING;
+			case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
+				return NotationPackage.LIST_COMPARTMENT__FILTERING_KEYS;
+			case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
+				return NotationPackage.LIST_COMPARTMENT__FILTERED_OBJECTS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == TitleStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.TITLE_STYLE__SHOW_TITLE: return NotationPackage.LIST_COMPARTMENT__SHOW_TITLE;
-				default: return -1;
+			case NotationPackage.TITLE_STYLE__SHOW_TITLE:
+				return NotationPackage.LIST_COMPARTMENT__SHOW_TITLE;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (sorting: "); //$NON-NLS-1$
@@ -756,4 +797,4 @@
 		return result.toString();
 	}
 
-} //ListCompartmentImpl
+} // ListCompartmentImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ListValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ListValueStyleImpl.java
index fe10ec0..c689b90 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ListValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ListValueStyleImpl.java
@@ -23,31 +23,32 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>List
+ * Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl#getRawValuesList <em>Raw Values List</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl#getRawValuesList
+ * <em>Raw Values List</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class ListValueStyleImpl extends DataTypeStyleImpl implements ListValueStyle {
 	/**
-	 * The cached value of the '{@link #getRawValuesList() <em>Raw Values List</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRawValuesList() <em>Raw Values
+	 * List</em>}' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRawValuesList()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList rawValuesList;
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ListValueStyleImpl() {
@@ -55,8 +56,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -64,8 +65,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public EList getRawValuesList() {
@@ -82,35 +83,36 @@
 			public int getFeatureID() {
 				return NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST;
 			}
-			
+
 			protected boolean isNotificationRequired() {
 				// Never notify. The delegate list does so already.
 				return false;
 			}
-			
+
 			protected List delegateList() {
 				return delegate;
 			}
-			
+
 			protected Object validate(int index, Object object) {
 				Object validated = super.validate(index, object);
 				if (validated != null && !isInstance(validated))
 					throw new ArrayStoreException();
 				try {
-					getObjectFromString((String)validated);
+					getObjectFromString((String) validated);
 				} catch (Exception e) {
 					throw new IllegalArgumentException("Value <" + validated//$NON-NLS-1$
 							+ "> cannot be associated with Data type <"//$NON-NLS-1$
 							+ getInstanceType().toString() + ">: " + e.getMessage());//$NON-NLS-1$
 				}
 				return validated;
-			}};
+			}
+		};
 		return rawValuesList;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getRawValuesListGen() {
@@ -121,88 +123,90 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.LIST_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.LIST_VALUE_STYLE__INSTANCE_TYPE:
-				if (resolve) return getInstanceType();
-				return basicGetInstanceType();
-			case NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST:
-				return getRawValuesList();
+		case NotationPackage.LIST_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.LIST_VALUE_STYLE__INSTANCE_TYPE:
+			if (resolve)
+				return getInstanceType();
+			return basicGetInstanceType();
+		case NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST:
+			return getRawValuesList();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.LIST_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.LIST_VALUE_STYLE__INSTANCE_TYPE:
-				setInstanceType((EDataType)newValue);
-				return;
-			case NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST:
-				getRawValuesList().clear();
-				getRawValuesList().addAll((Collection)newValue);
-				return;
+		case NotationPackage.LIST_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.LIST_VALUE_STYLE__INSTANCE_TYPE:
+			setInstanceType((EDataType) newValue);
+			return;
+		case NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST:
+			getRawValuesList().clear();
+			getRawValuesList().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LIST_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.LIST_VALUE_STYLE__INSTANCE_TYPE:
-				setInstanceType((EDataType)null);
-				return;
-			case NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST:
-				getRawValuesList().clear();
-				return;
+		case NotationPackage.LIST_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.LIST_VALUE_STYLE__INSTANCE_TYPE:
+			setInstanceType((EDataType) null);
+			return;
+		case NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST:
+			getRawValuesList().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LIST_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.LIST_VALUE_STYLE__INSTANCE_TYPE:
-				return instanceType != null;
-			case NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST:
-				return rawValuesList != null && !rawValuesList.isEmpty();
+		case NotationPackage.LIST_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.LIST_VALUE_STYLE__INSTANCE_TYPE:
+			return instanceType != null;
+		case NotationPackage.LIST_VALUE_STYLE__RAW_VALUES_LIST:
+			return rawValuesList != null && !rawValuesList.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (rawValuesList: "); //$NON-NLS-1$
@@ -210,5 +214,5 @@
 		result.append(')');
 		return result.toString();
 	}
-	
-} //ListValueStyleImpl
+
+} // ListValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LocationImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LocationImpl.java
index 2e209ec..638eab7 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LocationImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/LocationImpl.java
@@ -20,16 +20,17 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Location</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Location</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.LocationImpl#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.LocationImpl#getY <em>Y</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.LocationImpl#getX
+ * <em>X</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.LocationImpl#getY
+ * <em>Y</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -37,76 +38,76 @@
  * @canBeSeenBy %partners
  */
 public class LocationImpl extends MinimalEObjectImpl.Container implements Location {
-    /**
-	 * The default value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getX() <em>X</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getX()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int X_EDEFAULT = 0;
 
-    /**
-	 * The cached value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getX() <em>X</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getX()
 	 * @generated
 	 * @ordered
 	 */
 	protected int x = X_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getY() <em>Y</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getY()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int Y_EDEFAULT = 0;
 
-    /**
-	 * The cached value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getY() <em>Y</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getY()
 	 * @generated
 	 * @ordered
 	 */
 	protected int y = Y_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LocationImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.LOCATION;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getX() {
 		return x;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setX(int newX) {
@@ -116,18 +117,18 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LOCATION__X, oldX, x));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getY() {
 		return y;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setY(int newY) {
@@ -137,77 +138,78 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.LOCATION__Y, oldY, y));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.LOCATION__X:
-				return new Integer(getX());
-			case NotationPackage.LOCATION__Y:
-				return new Integer(getY());
+		case NotationPackage.LOCATION__X:
+			return new Integer(getX());
+		case NotationPackage.LOCATION__Y:
+			return new Integer(getY());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.LOCATION__X:
-				setX(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.LOCATION__Y:
-				setY(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.LOCATION__X:
+			setX(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.LOCATION__Y:
+			setY(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LOCATION__X:
-				setX(X_EDEFAULT);
-				return;
-			case NotationPackage.LOCATION__Y:
-				setY(Y_EDEFAULT);
-				return;
+		case NotationPackage.LOCATION__X:
+			setX(X_EDEFAULT);
+			return;
+		case NotationPackage.LOCATION__Y:
+			setY(Y_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.LOCATION__X:
-				return x != X_EDEFAULT;
-			case NotationPackage.LOCATION__Y:
-				return y != Y_EDEFAULT;
+		case NotationPackage.LOCATION__X:
+			return x != X_EDEFAULT;
+		case NotationPackage.LOCATION__Y:
+			return y != Y_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (x: "); //$NON-NLS-1$
@@ -218,4 +220,4 @@
 		return result.toString();
 	}
 
-} //LocationImpl
+} // LocationImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/MultiDiagramLinkStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/MultiDiagramLinkStyleImpl.java
index 0ff7795..d17b78c 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/MultiDiagramLinkStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/MultiDiagramLinkStyleImpl.java
@@ -22,23 +22,23 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Multi Diagram Link Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Multi
+ * Diagram Link Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl#getDiagramLinks <em>Diagram Links</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl#getDiagramLinks
+ * <em>Diagram Links</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class MultiDiagramLinkStyleImpl extends MinimalEObjectImpl.Container implements MultiDiagramLinkStyle {
 	/**
-	 * The cached value of the '{@link #getDiagramLinks() <em>Diagram Links</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDiagramLinks() <em>Diagram Links</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDiagramLinks()
 	 * @generated
 	 * @ordered
@@ -46,8 +46,8 @@
 	protected EList diagramLinks;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MultiDiagramLinkStyleImpl() {
@@ -55,8 +55,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -64,70 +64,71 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getDiagramLinks() {
 		if (diagramLinks == null) {
-			diagramLinks = new EObjectResolvingEList(Diagram.class, this, NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS);
+			diagramLinks = new EObjectResolvingEList(Diagram.class, this,
+					NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS);
 		}
 		return diagramLinks;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS:
-				return getDiagramLinks();
+		case NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS:
+			return getDiagramLinks();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS:
-				getDiagramLinks().clear();
-				getDiagramLinks().addAll((Collection)newValue);
-				return;
+		case NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS:
+			getDiagramLinks().clear();
+			getDiagramLinks().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS:
-				getDiagramLinks().clear();
-				return;
+		case NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS:
+			getDiagramLinks().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS:
-				return diagramLinks != null && !diagramLinks.isEmpty();
+		case NotationPackage.MULTI_DIAGRAM_LINK_STYLE__DIAGRAM_LINKS:
+			return diagramLinks != null && !diagramLinks.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //MultiDiagramLinkStyleImpl
+} // MultiDiagramLinkStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NamedStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NamedStyleImpl.java
index c7219ce..9a1f78a 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NamedStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NamedStyleImpl.java
@@ -19,23 +19,23 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Named Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Named
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl#getName <em>Name</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl#getName
+ * <em>Name</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class NamedStyleImpl extends MinimalEObjectImpl.Container implements NamedStyle {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -43,9 +43,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -53,8 +53,8 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NamedStyleImpl() {
@@ -62,8 +62,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -71,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -80,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
@@ -92,66 +92,67 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.NAMED_STYLE__NAME:
-				return getName();
+		case NotationPackage.NAMED_STYLE__NAME:
+			return getName();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.NAMED_STYLE__NAME:
-				setName((String)newValue);
-				return;
+		case NotationPackage.NAMED_STYLE__NAME:
+			setName((String) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.NAMED_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
+		case NotationPackage.NAMED_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.NAMED_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.NAMED_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
@@ -160,4 +161,4 @@
 		return result.toString();
 	}
 
-} //NamedStyleImpl
+} // NamedStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NodeEntryImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NodeEntryImpl.java
index 2dc9729..f4b07e1 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NodeEntryImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NodeEntryImpl.java
@@ -25,16 +25,17 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Node Entry</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Node
+ * Entry</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl#getTypedValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl#getTypedKey <em>Key</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl#getTypedValue
+ * <em>Value</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl#getTypedKey
+ * <em>Key</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -42,73 +43,76 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class NodeEntryImpl extends MinimalEObjectImpl.Container implements BasicEMap.Entry {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
-    /**
+
+	/**
 	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final Alignment VALUE_EDEFAULT = Alignment.CENTER_LITERAL;
 
-    /**
-	 * The offset of the flags representing the value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The offset of the flags representing the value of the
+	 * '{@link #getTypedValue() <em>Value</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int VALUE_EFLAG_OFFSET = 8;
 
-				/**
-	 * The flags representing the default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the default value of the '{@link #getTypedValue()
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int VALUE_EFLAG_DEFAULT = Alignment.VALUES.indexOf(VALUE_EDEFAULT) << VALUE_EFLAG_OFFSET;
 
-				/**
-	 * The array of enumeration values for '{@link Alignment Alignment}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The array of enumeration values for '{@link Alignment Alignment}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Alignment[] VALUE_EFLAG_VALUES = (Alignment[])Alignment.VALUES.toArray(new Alignment[Alignment.VALUES.size()]);
+	private static final Alignment[] VALUE_EFLAG_VALUES = (Alignment[]) Alignment.VALUES
+			.toArray(new Alignment[Alignment.VALUES.size()]);
 
-				/**
-	 * The flags representing the value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the value of the '{@link #getTypedValue()
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int VALUE_EFLAG = 0x7 << VALUE_EFLAG_OFFSET;
 
-				/**
-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
 	 */
 	protected Node key;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NodeEntryImpl() {
@@ -116,9 +120,9 @@
 		eFlags |= VALUE_EFLAG_DEFAULT;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -126,47 +130,50 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Alignment getTypedValue() {
 		return VALUE_EFLAG_VALUES[(eFlags & VALUE_EFLAG) >>> VALUE_EFLAG_OFFSET];
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTypedValue(Alignment newValue) {
 		Alignment oldValue = VALUE_EFLAG_VALUES[(eFlags & VALUE_EFLAG) >>> VALUE_EFLAG_OFFSET];
-		if (newValue == null) newValue = VALUE_EDEFAULT;
+		if (newValue == null)
+			newValue = VALUE_EDEFAULT;
 		eFlags = eFlags & ~VALUE_EFLAG | Alignment.VALUES.indexOf(newValue) << VALUE_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.NODE_ENTRY__VALUE, oldValue, newValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.NODE_ENTRY__VALUE, oldValue,
+					newValue));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Node getTypedKey() {
 		if (key != null && key.eIsProxy()) {
-			EObject oldKey = key;
-			key = (Node)eResolveProxy((InternalEObject)key);
+			InternalEObject oldKey = (InternalEObject) key;
+			key = (Node) eResolveProxy(oldKey);
 			if (key != oldKey) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NotationPackage.NODE_ENTRY__KEY, oldKey, key));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NotationPackage.NODE_ENTRY__KEY, oldKey,
+							key));
 			}
 		}
 		return key;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Node basicGetTypedKey() {
@@ -174,8 +181,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTypedKey(Node newKey) {
@@ -185,78 +192,80 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.NODE_ENTRY__KEY, oldKey, key));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.NODE_ENTRY__VALUE:
-				return getTypedValue();
-			case NotationPackage.NODE_ENTRY__KEY:
-				if (resolve) return getTypedKey();
-				return basicGetTypedKey();
+		case NotationPackage.NODE_ENTRY__VALUE:
+			return getTypedValue();
+		case NotationPackage.NODE_ENTRY__KEY:
+			if (resolve)
+				return getTypedKey();
+			return basicGetTypedKey();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.NODE_ENTRY__VALUE:
-				setTypedValue((Alignment)newValue);
-				return;
-			case NotationPackage.NODE_ENTRY__KEY:
-				setTypedKey((Node)newValue);
-				return;
+		case NotationPackage.NODE_ENTRY__VALUE:
+			setTypedValue((Alignment) newValue);
+			return;
+		case NotationPackage.NODE_ENTRY__KEY:
+			setTypedKey((Node) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.NODE_ENTRY__VALUE:
-				setTypedValue(VALUE_EDEFAULT);
-				return;
-			case NotationPackage.NODE_ENTRY__KEY:
-				setTypedKey((Node)null);
-				return;
+		case NotationPackage.NODE_ENTRY__VALUE:
+			setTypedValue(VALUE_EDEFAULT);
+			return;
+		case NotationPackage.NODE_ENTRY__KEY:
+			setTypedKey((Node) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.NODE_ENTRY__VALUE:
-				return (eFlags & VALUE_EFLAG) != VALUE_EFLAG_DEFAULT;
-			case NotationPackage.NODE_ENTRY__KEY:
-				return key != null;
+		case NotationPackage.NODE_ENTRY__VALUE:
+			return (eFlags & VALUE_EFLAG) != VALUE_EFLAG_DEFAULT;
+		case NotationPackage.NODE_ENTRY__KEY:
+			return key != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: "); //$NON-NLS-1$
@@ -265,16 +274,16 @@
 		return result.toString();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected int hash = -1;
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getHash() {
@@ -285,61 +294,61 @@
 		return hash;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHash(int hash) {
 		this.hash = hash;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getKey() {
 		return getTypedKey();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setKey(Object key) {
-		setTypedKey((Node)key);
+		setTypedKey((Node) key);
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getValue() {
 		return getTypedValue();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object setValue(Object value) {
 		Object oldValue = getValue();
-		setTypedValue((Alignment)value);
+		setTypedValue((Alignment) value);
 		return oldValue;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EMap getEMap() {
 		EObject container = eContainer();
-		return container == null ? null : (EMap)container.eGet(eContainmentFeature());
+		return container == null ? null : (EMap) container.eGet(eContainmentFeature());
 	}
 
-} //NodeEntryImpl
+} // NodeEntryImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NodeImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NodeImpl.java
index 775639a..aefbd3a 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NodeImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NodeImpl.java
@@ -26,15 +26,15 @@
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Node</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.NodeImpl#getLayoutConstraint <em>Layout Constraint</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.NodeImpl#getLayoutConstraint
+ * <em>Layout Constraint</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -42,276 +42,286 @@
  * @canBeSeenBy %partners
  */
 public class NodeImpl extends ViewImpl implements Node {
-    /**
-	 * The cached value of the '{@link #getLayoutConstraint() <em>Layout Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getLayoutConstraint() <em>Layout
+	 * Constraint</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getLayoutConstraint()
 	 * @generated
 	 * @ordered
 	 */
 	protected LayoutConstraint layoutConstraint;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NodeImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.NODE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LayoutConstraint getLayoutConstraint() {
 		return layoutConstraint;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetLayoutConstraint(LayoutConstraint newLayoutConstraint, NotificationChain msgs) {
 		LayoutConstraint oldLayoutConstraint = layoutConstraint;
 		layoutConstraint = newLayoutConstraint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.NODE__LAYOUT_CONSTRAINT, oldLayoutConstraint, newLayoutConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.NODE__LAYOUT_CONSTRAINT, oldLayoutConstraint, newLayoutConstraint);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLayoutConstraint(LayoutConstraint newLayoutConstraint) {
 		if (newLayoutConstraint != layoutConstraint) {
 			NotificationChain msgs = null;
 			if (layoutConstraint != null)
-				msgs = ((InternalEObject)layoutConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
+				msgs = ((InternalEObject) layoutConstraint).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
 			if (newLayoutConstraint != null)
-				msgs = ((InternalEObject)newLayoutConstraint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
+				msgs = ((InternalEObject) newLayoutConstraint).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.NODE__LAYOUT_CONSTRAINT, null, msgs);
 			msgs = basicSetLayoutConstraint(newLayoutConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.NODE__LAYOUT_CONSTRAINT, newLayoutConstraint, newLayoutConstraint));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.NODE__LAYOUT_CONSTRAINT,
+					newLayoutConstraint, newLayoutConstraint));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 */
 	public LayoutConstraint createLayoutConstraint(EClass eClass) {
-		LayoutConstraint newLayoutConstraint = (LayoutConstraint) eClass.getEPackage().getEFactoryInstance().create(eClass);
+		LayoutConstraint newLayoutConstraint = (LayoutConstraint) eClass.getEPackage().getEFactoryInstance()
+				.create(eClass);
 		setLayoutConstraint(newLayoutConstraint);
 		return newLayoutConstraint;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.NODE__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-			case NotationPackage.NODE__SOURCE_EDGES:
-				return ((InternalEList)getSourceEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.NODE__TARGET_EDGES:
-				return ((InternalEList)getTargetEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.NODE__PERSISTED_CHILDREN:
-				return ((InternalEList)getPersistedChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.NODE__STYLES:
-				return ((InternalEList)getStyles()).basicRemove(otherEnd, msgs);
-			case NotationPackage.NODE__TRANSIENT_CHILDREN:
-				return ((InternalEList)getTransientChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.NODE__LAYOUT_CONSTRAINT:
-				return basicSetLayoutConstraint(null, msgs);
+		case NotationPackage.NODE__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
+		case NotationPackage.NODE__SOURCE_EDGES:
+			return ((InternalEList) getSourceEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.NODE__TARGET_EDGES:
+			return ((InternalEList) getTargetEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.NODE__PERSISTED_CHILDREN:
+			return ((InternalEList) getPersistedChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.NODE__STYLES:
+			return ((InternalEList) getStyles()).basicRemove(otherEnd, msgs);
+		case NotationPackage.NODE__TRANSIENT_CHILDREN:
+			return ((InternalEList) getTransientChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.NODE__LAYOUT_CONSTRAINT:
+			return basicSetLayoutConstraint(null, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.NODE__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.NODE__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.NODE__TYPE:
-				return getType();
-			case NotationPackage.NODE__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.NODE__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.NODE__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.NODE__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.NODE__STYLES:
-				return getStyles();
-			case NotationPackage.NODE__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.NODE__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.NODE__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.NODE__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
+		case NotationPackage.NODE__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.NODE__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.NODE__TYPE:
+			return getType();
+		case NotationPackage.NODE__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.NODE__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.NODE__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.NODE__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.NODE__STYLES:
+			return getStyles();
+		case NotationPackage.NODE__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.NODE__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.NODE__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.NODE__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.NODE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.NODE__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.NODE__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.NODE__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.NODE__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.NODE__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.NODE__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.NODE__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.NODE__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.NODE__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.NODE__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)newValue);
-				return;
+		case NotationPackage.NODE__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.NODE__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.NODE__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.NODE__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.NODE__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.NODE__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.NODE__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.NODE__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.NODE__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.NODE__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.NODE__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.NODE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.NODE__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.NODE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.NODE__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.NODE__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.NODE__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.NODE__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.NODE__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.NODE__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.NODE__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.NODE__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)null);
-				return;
+		case NotationPackage.NODE__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.NODE__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.NODE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.NODE__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.NODE__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.NODE__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.NODE__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.NODE__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.NODE__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.NODE__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.NODE__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.NODE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.NODE__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.NODE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.NODE__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.NODE__SOURCE_EDGES:
-				return sourceEdges != null && !sourceEdges.isEmpty();
-			case NotationPackage.NODE__TARGET_EDGES:
-				return targetEdges != null && !targetEdges.isEmpty();
-			case NotationPackage.NODE__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.NODE__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.NODE__ELEMENT:
-				return isSetElement();
-			case NotationPackage.NODE__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.NODE__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.NODE__LAYOUT_CONSTRAINT:
-				return layoutConstraint != null;
+		case NotationPackage.NODE__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.NODE__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.NODE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.NODE__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.NODE__SOURCE_EDGES:
+			return sourceEdges != null && !sourceEdges.isEmpty();
+		case NotationPackage.NODE__TARGET_EDGES:
+			return targetEdges != null && !targetEdges.isEmpty();
+		case NotationPackage.NODE__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.NODE__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.NODE__ELEMENT:
+			return isSetElement();
+		case NotationPackage.NODE__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.NODE__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.NODE__LAYOUT_CONSTRAINT:
+			return layoutConstraint != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //NodeImpl
+} // NodeImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationEObjectImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationEObjectImpl.java
index 8caf575..c152c99 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationEObjectImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationEObjectImpl.java
@@ -17,66 +17,58 @@
  */
 package org.eclipse.gmf.runtime.notation.impl;
 
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EContentsEList;
 import org.eclipse.emf.ecore.util.ECrossReferenceEList;
 
-
 /**
- * An implementation of the model object '<em><b>EObject</b></em>'.
- * This implementation flattens the fields for storing 
- * the {@link #eProxyURI}, the {@link #eContents}, and the {@link #eCrossReferences},
- * which in {@link EObjectImpl} are stored in the properties holder.
- * This reduces the likelihood of needing to allocate a properties holder and speeds up the access to these fields.
- * @deprecated use {@link org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container}
+ * An implementation of the model object '<em><b>EObject</b></em>'. This
+ * implementation flattens the fields for storing the {@link #eProxyURI}, the
+ * {@link #eContents}, and the {@link #eCrossReferences}, which in
+ * {@link EObjectImpl} are stored in the properties holder. This reduces the
+ * likelihood of needing to allocate a properties holder and speeds up the
+ * access to these fields.
+ * 
+ * @deprecated use
+ *             {@link org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container}
  */
-public class NotationEObjectImpl extends EObjectImpl
-{
-  protected URI eProxyURI;
+public class NotationEObjectImpl extends EObjectImpl {
+	protected URI eProxyURI;
 
-  /**
-   * Creates an EObject that is faster and more space efficient.
-   */
-  protected NotationEObjectImpl() 
-  {
-    super();
-  }
+	/**
+	 * Creates an EObject that is faster and more space efficient.
+	 */
+	protected NotationEObjectImpl() {
+		super();
+	}
 
-  protected EPropertiesHolder eProperties()
-  {
-    if (eProperties == null)
-    {
-      eProperties = new EPropertiesHolderBaseImpl() {};
-    }
-    return eProperties;
-  }
+	protected EPropertiesHolder eProperties() {
+		if (eProperties == null) {
+			eProperties = new EPropertiesHolderBaseImpl() {
+			};
+		}
+		return eProperties;
+	}
 
-  public boolean eIsProxy()
-  {
-    return eProxyURI != null;
-  }
-  
-  public URI eProxyURI()
-  {
-    return eProxyURI;
-  }
+	public boolean eIsProxy() {
+		return eProxyURI != null;
+	}
 
-  public void eSetProxyURI(URI uri)
-  {
-    eProxyURI = uri;
-  }
+	public URI eProxyURI() {
+		return eProxyURI;
+	}
 
-  public EList eContents()
-  {
-    return EContentsEList.createEContentsEList(this);
-  }
+	public void eSetProxyURI(URI uri) {
+		eProxyURI = uri;
+	}
 
-  public EList eCrossReferences()
-  {
-    return ECrossReferenceEList.createECrossReferenceEList(this);
-  }
+	public EList eContents() {
+		return EContentsEList.createEContentsEList(this);
+	}
+
+	public EList eCrossReferences() {
+		return ECrossReferenceEList.createECrossReferenceEList(this);
+	}
 }
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationFactoryImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationFactoryImpl.java
index 6ee987a..7b4be62 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationFactoryImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationFactoryImpl.java
@@ -25,18 +25,22 @@
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 import org.eclipse.gmf.runtime.notation.Alignment;
 import org.eclipse.gmf.runtime.notation.ArrowStyle;
 import org.eclipse.gmf.runtime.notation.ArrowType;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.BasicDecorationNode;
+import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment;
 import org.eclipse.gmf.runtime.notation.BooleanListValueStyle;
 import org.eclipse.gmf.runtime.notation.BooleanValueStyle;
 import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.gmf.runtime.notation.ByteArrayValueStyle;
 import org.eclipse.gmf.runtime.notation.CanonicalStyle;
+import org.eclipse.gmf.runtime.notation.Compartment;
+import org.eclipse.gmf.runtime.notation.Connector;
 import org.eclipse.gmf.runtime.notation.ConnectorStyle;
 import org.eclipse.gmf.runtime.notation.DataTypeStyle;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
 import org.eclipse.gmf.runtime.notation.DescriptionStyle;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.DiagramLinkStyle;
@@ -51,6 +55,7 @@
 import org.eclipse.gmf.runtime.notation.Filtering;
 import org.eclipse.gmf.runtime.notation.FilteringStyle;
 import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.GradientStyle;
 import org.eclipse.gmf.runtime.notation.Guide;
 import org.eclipse.gmf.runtime.notation.GuideStyle;
 import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
@@ -65,6 +70,7 @@
 import org.eclipse.gmf.runtime.notation.LineStyle;
 import org.eclipse.gmf.runtime.notation.LineType;
 import org.eclipse.gmf.runtime.notation.LineTypeStyle;
+import org.eclipse.gmf.runtime.notation.ListCompartment;
 import org.eclipse.gmf.runtime.notation.ListValueStyle;
 import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.MeasurementUnit;
@@ -78,8 +84,11 @@
 import org.eclipse.gmf.runtime.notation.PropertyValue;
 import org.eclipse.gmf.runtime.notation.Ratio;
 import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
+import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
 import org.eclipse.gmf.runtime.notation.Routing;
 import org.eclipse.gmf.runtime.notation.RoutingStyle;
+import org.eclipse.gmf.runtime.notation.SemanticListCompartment;
+import org.eclipse.gmf.runtime.notation.Shape;
 import org.eclipse.gmf.runtime.notation.ShapeStyle;
 import org.eclipse.gmf.runtime.notation.SingleValueStyle;
 import org.eclipse.gmf.runtime.notation.Size;
@@ -87,220 +96,286 @@
 import org.eclipse.gmf.runtime.notation.Sorting;
 import org.eclipse.gmf.runtime.notation.SortingDirection;
 import org.eclipse.gmf.runtime.notation.SortingStyle;
+import org.eclipse.gmf.runtime.notation.StandardDiagram;
 import org.eclipse.gmf.runtime.notation.StringListValueStyle;
 import org.eclipse.gmf.runtime.notation.StringValueStyle;
 import org.eclipse.gmf.runtime.notation.TextAlignment;
 import org.eclipse.gmf.runtime.notation.TextStyle;
 import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class NotationFactoryImpl extends EFactoryImpl implements NotationFactory {
-    /**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * Creates the default factory implementation. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public static NotationFactory init() {
+	public static NotationFactory init() {
 		try {
-			NotationFactory theNotationFactory = (NotationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/gmf/runtime/1.0.2/notation"); //$NON-NLS-1$ 
+			NotationFactory theNotationFactory = (NotationFactory) EPackage.Registry.INSTANCE
+					.getEFactory(NotationPackage.eNS_URI);
 			if (theNotationFactory != null) {
 				return theNotationFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new NotationFactoryImpl();
 	}
 
-    /**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	public NotationFactoryImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case NotationPackage.EDGE: return createEdge();
-			case NotationPackage.NODE: return createNode();
-			case NotationPackage.FILL_STYLE: return createFillStyle();
-			case NotationPackage.LINE_STYLE: return createLineStyle();
-			case NotationPackage.FONT_STYLE: return createFontStyle();
-			case NotationPackage.TITLE_STYLE: return createTitleStyle();
-			case NotationPackage.SORTING_STYLE: return createSortingStyle();
-			case NotationPackage.DESCRIPTION_STYLE: return createDescriptionStyle();
-			case NotationPackage.SIZE: return createSize();
-			case NotationPackage.LOCATION: return createLocation();
-			case NotationPackage.BOUNDS: return createBounds();
-			case NotationPackage.RATIO: return createRatio();
-			case NotationPackage.IDENTITY_ANCHOR: return createIdentityAnchor();
-			case NotationPackage.ROUTING_STYLE: return createRoutingStyle();
-			case NotationPackage.RELATIVE_BENDPOINTS: return createRelativeBendpoints();
-			case NotationPackage.DIAGRAM: return createDiagram();
-			case NotationPackage.IMAGE: return createImage();
-			case NotationPackage.CANONICAL_STYLE: return createCanonicalStyle();
-			case NotationPackage.SHAPE_STYLE: return createShapeStyle();
-			case NotationPackage.CONNECTOR_STYLE: return createConnectorStyle();
-			case NotationPackage.PAGE_STYLE: return createPageStyle();
-			case NotationPackage.DRAWER_STYLE: return createDrawerStyle();
-			case NotationPackage.GUIDE_STYLE: return createGuideStyle();
-			case NotationPackage.GUIDE: return createGuide();
-			case NotationPackage.NODE_ENTRY: return (EObject)createNodeEntry();
-			case NotationPackage.FILTERING_STYLE: return createFilteringStyle();
-			case NotationPackage.DIAGRAM_STYLE: return createDiagramStyle();
-			case NotationPackage.IMAGE_STYLE: return createImageStyle();
-			case NotationPackage.IMAGE_BUFFER_STYLE: return createImageBufferStyle();
-			case NotationPackage.PROPERTIES_SET_STYLE: return createPropertiesSetStyle();
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY: return (EObject)createStringToPropertyValueMapEntry();
-			case NotationPackage.PROPERTY_VALUE: return createPropertyValue();
-			case NotationPackage.SINGLE_VALUE_STYLE: return createSingleValueStyle();
-			case NotationPackage.LIST_VALUE_STYLE: return createListValueStyle();
-			case NotationPackage.NAMED_STYLE: return createNamedStyle();
-			case NotationPackage.DATA_TYPE_STYLE: return createDataTypeStyle();
-			case NotationPackage.INT_VALUE_STYLE: return createIntValueStyle();
-			case NotationPackage.INT_LIST_VALUE_STYLE: return createIntListValueStyle();
-			case NotationPackage.BOOLEAN_VALUE_STYLE: return createBooleanValueStyle();
-			case NotationPackage.DOUBLE_VALUE_STYLE: return createDoubleValueStyle();
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE: return createDoubleListValueStyle();
-			case NotationPackage.STRING_VALUE_STYLE: return createStringValueStyle();
-			case NotationPackage.STRING_LIST_VALUE_STYLE: return createStringListValueStyle();
-			case NotationPackage.EOBJECT_VALUE_STYLE: return createEObjectValueStyle();
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE: return createEObjectListValueStyle();
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE: return createByteArrayValueStyle();
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE: return createBooleanListValueStyle();
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE: return createHintedDiagramLinkStyle();
-			case NotationPackage.DIAGRAM_LINK_STYLE: return createDiagramLinkStyle();
-			case NotationPackage.MULTI_DIAGRAM_LINK_STYLE: return createMultiDiagramLinkStyle();
-			case NotationPackage.TEXT_STYLE: return createTextStyle();
-			case NotationPackage.LINE_TYPE_STYLE: return createLineTypeStyle();
-			case NotationPackage.ARROW_STYLE: return createArrowStyle();
-			case NotationPackage.SHAPE: return createShape();
-			case NotationPackage.COMPARTMENT: return createCompartment();
-			case NotationPackage.LIST_COMPARTMENT: return createListCompartment();
-			case NotationPackage.CONNECTOR: return createConnector();
-			case NotationPackage.STANDARD_DIAGRAM: return createStandardDiagram();
-			case NotationPackage.DECORATION_NODE: return createDecorationNode();
-			case NotationPackage.BASIC_DECORATION_NODE: return createBasicDecorationNode();
-			case NotationPackage.BASIC_COMPARTMENT: return createBasicCompartment();
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT: return createBasicSemanticCompartment();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT: return createSemanticListCompartment();
-			case NotationPackage.ROUNDED_CORNERS_STYLE: return createRoundedCornersStyle();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		case NotationPackage.EDGE:
+			return createEdge();
+		case NotationPackage.NODE:
+			return createNode();
+		case NotationPackage.FILL_STYLE:
+			return createFillStyle();
+		case NotationPackage.LINE_STYLE:
+			return createLineStyle();
+		case NotationPackage.FONT_STYLE:
+			return createFontStyle();
+		case NotationPackage.TITLE_STYLE:
+			return createTitleStyle();
+		case NotationPackage.SORTING_STYLE:
+			return createSortingStyle();
+		case NotationPackage.DESCRIPTION_STYLE:
+			return createDescriptionStyle();
+		case NotationPackage.SIZE:
+			return createSize();
+		case NotationPackage.LOCATION:
+			return createLocation();
+		case NotationPackage.BOUNDS:
+			return createBounds();
+		case NotationPackage.RATIO:
+			return createRatio();
+		case NotationPackage.IDENTITY_ANCHOR:
+			return createIdentityAnchor();
+		case NotationPackage.ROUTING_STYLE:
+			return createRoutingStyle();
+		case NotationPackage.RELATIVE_BENDPOINTS:
+			return createRelativeBendpoints();
+		case NotationPackage.DIAGRAM:
+			return createDiagram();
+		case NotationPackage.IMAGE:
+			return createImage();
+		case NotationPackage.CANONICAL_STYLE:
+			return createCanonicalStyle();
+		case NotationPackage.SHAPE_STYLE:
+			return createShapeStyle();
+		case NotationPackage.CONNECTOR_STYLE:
+			return createConnectorStyle();
+		case NotationPackage.PAGE_STYLE:
+			return createPageStyle();
+		case NotationPackage.DRAWER_STYLE:
+			return createDrawerStyle();
+		case NotationPackage.GUIDE_STYLE:
+			return createGuideStyle();
+		case NotationPackage.GUIDE:
+			return createGuide();
+		case NotationPackage.NODE_ENTRY:
+			return (EObject) createNodeEntry();
+		case NotationPackage.FILTERING_STYLE:
+			return createFilteringStyle();
+		case NotationPackage.DIAGRAM_STYLE:
+			return createDiagramStyle();
+		case NotationPackage.IMAGE_STYLE:
+			return createImageStyle();
+		case NotationPackage.IMAGE_BUFFER_STYLE:
+			return createImageBufferStyle();
+		case NotationPackage.PROPERTIES_SET_STYLE:
+			return createPropertiesSetStyle();
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY:
+			return (EObject) createStringToPropertyValueMapEntry();
+		case NotationPackage.PROPERTY_VALUE:
+			return createPropertyValue();
+		case NotationPackage.SINGLE_VALUE_STYLE:
+			return createSingleValueStyle();
+		case NotationPackage.LIST_VALUE_STYLE:
+			return createListValueStyle();
+		case NotationPackage.NAMED_STYLE:
+			return createNamedStyle();
+		case NotationPackage.DATA_TYPE_STYLE:
+			return createDataTypeStyle();
+		case NotationPackage.INT_VALUE_STYLE:
+			return createIntValueStyle();
+		case NotationPackage.INT_LIST_VALUE_STYLE:
+			return createIntListValueStyle();
+		case NotationPackage.BOOLEAN_VALUE_STYLE:
+			return createBooleanValueStyle();
+		case NotationPackage.DOUBLE_VALUE_STYLE:
+			return createDoubleValueStyle();
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE:
+			return createDoubleListValueStyle();
+		case NotationPackage.STRING_VALUE_STYLE:
+			return createStringValueStyle();
+		case NotationPackage.STRING_LIST_VALUE_STYLE:
+			return createStringListValueStyle();
+		case NotationPackage.EOBJECT_VALUE_STYLE:
+			return createEObjectValueStyle();
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE:
+			return createEObjectListValueStyle();
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE:
+			return createByteArrayValueStyle();
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE:
+			return createBooleanListValueStyle();
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE:
+			return createHintedDiagramLinkStyle();
+		case NotationPackage.DIAGRAM_LINK_STYLE:
+			return createDiagramLinkStyle();
+		case NotationPackage.MULTI_DIAGRAM_LINK_STYLE:
+			return createMultiDiagramLinkStyle();
+		case NotationPackage.TEXT_STYLE:
+			return createTextStyle();
+		case NotationPackage.LINE_TYPE_STYLE:
+			return createLineTypeStyle();
+		case NotationPackage.ARROW_STYLE:
+			return createArrowStyle();
+		case NotationPackage.SHAPE:
+			return createShape();
+		case NotationPackage.COMPARTMENT:
+			return createCompartment();
+		case NotationPackage.LIST_COMPARTMENT:
+			return createListCompartment();
+		case NotationPackage.CONNECTOR:
+			return createConnector();
+		case NotationPackage.STANDARD_DIAGRAM:
+			return createStandardDiagram();
+		case NotationPackage.DECORATION_NODE:
+			return createDecorationNode();
+		case NotationPackage.BASIC_DECORATION_NODE:
+			return createBasicDecorationNode();
+		case NotationPackage.BASIC_COMPARTMENT:
+			return createBasicCompartment();
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT:
+			return createBasicSemanticCompartment();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT:
+			return createSemanticListCompartment();
+		case NotationPackage.ROUNDED_CORNERS_STYLE:
+			return createRoundedCornersStyle();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case NotationPackage.SORTING:
-				return createSortingFromString(eDataType, initialValue);
-			case NotationPackage.FILTERING:
-				return createFilteringFromString(eDataType, initialValue);
-			case NotationPackage.ROUTING:
-				return createRoutingFromString(eDataType, initialValue);
-			case NotationPackage.SMOOTHNESS:
-				return createSmoothnessFromString(eDataType, initialValue);
-			case NotationPackage.JUMP_LINK_STATUS:
-				return createJumpLinkStatusFromString(eDataType, initialValue);
-			case NotationPackage.JUMP_LINK_TYPE:
-				return createJumpLinkTypeFromString(eDataType, initialValue);
-			case NotationPackage.ALIGNMENT:
-				return createAlignmentFromString(eDataType, initialValue);
-			case NotationPackage.SORTING_DIRECTION:
-				return createSortingDirectionFromString(eDataType, initialValue);
-			case NotationPackage.MEASUREMENT_UNIT:
-				return createMeasurementUnitFromString(eDataType, initialValue);
-			case NotationPackage.TEXT_ALIGNMENT:
-				return createTextAlignmentFromString(eDataType, initialValue);
-			case NotationPackage.LINE_TYPE:
-				return createLineTypeFromString(eDataType, initialValue);
-			case NotationPackage.ARROW_TYPE:
-				return createArrowTypeFromString(eDataType, initialValue);
-			case NotationPackage.GRADIENT_STYLE:
-				return createGradientStyleFromString(eDataType, initialValue);
-			case NotationPackage.RELATIVE_BENDPOINT_LIST:
-				return createRelativeBendpointListFromString(eDataType, initialValue);
-			case NotationPackage.FILTER_KEY_LIST:
-				return createFilterKeyListFromString(eDataType, initialValue);
-			case NotationPackage.SORT_KEY_MAP:
-				return createSortKeyMapFromString(eDataType, initialValue);
-			case NotationPackage.GRADIENT_DATA:
-				return createGradientDataFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		case NotationPackage.SORTING:
+			return createSortingFromString(eDataType, initialValue);
+		case NotationPackage.FILTERING:
+			return createFilteringFromString(eDataType, initialValue);
+		case NotationPackage.ROUTING:
+			return createRoutingFromString(eDataType, initialValue);
+		case NotationPackage.SMOOTHNESS:
+			return createSmoothnessFromString(eDataType, initialValue);
+		case NotationPackage.JUMP_LINK_STATUS:
+			return createJumpLinkStatusFromString(eDataType, initialValue);
+		case NotationPackage.JUMP_LINK_TYPE:
+			return createJumpLinkTypeFromString(eDataType, initialValue);
+		case NotationPackage.ALIGNMENT:
+			return createAlignmentFromString(eDataType, initialValue);
+		case NotationPackage.SORTING_DIRECTION:
+			return createSortingDirectionFromString(eDataType, initialValue);
+		case NotationPackage.MEASUREMENT_UNIT:
+			return createMeasurementUnitFromString(eDataType, initialValue);
+		case NotationPackage.TEXT_ALIGNMENT:
+			return createTextAlignmentFromString(eDataType, initialValue);
+		case NotationPackage.LINE_TYPE:
+			return createLineTypeFromString(eDataType, initialValue);
+		case NotationPackage.ARROW_TYPE:
+			return createArrowTypeFromString(eDataType, initialValue);
+		case NotationPackage.GRADIENT_STYLE:
+			return createGradientStyleFromString(eDataType, initialValue);
+		case NotationPackage.RELATIVE_BENDPOINT_LIST:
+			return createRelativeBendpointListFromString(eDataType, initialValue);
+		case NotationPackage.FILTER_KEY_LIST:
+			return createFilterKeyListFromString(eDataType, initialValue);
+		case NotationPackage.SORT_KEY_MAP:
+			return createSortKeyMapFromString(eDataType, initialValue);
+		case NotationPackage.GRADIENT_DATA:
+			return createGradientDataFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-			case NotationPackage.SORTING:
-				return convertSortingToString(eDataType, instanceValue);
-			case NotationPackage.FILTERING:
-				return convertFilteringToString(eDataType, instanceValue);
-			case NotationPackage.ROUTING:
-				return convertRoutingToString(eDataType, instanceValue);
-			case NotationPackage.SMOOTHNESS:
-				return convertSmoothnessToString(eDataType, instanceValue);
-			case NotationPackage.JUMP_LINK_STATUS:
-				return convertJumpLinkStatusToString(eDataType, instanceValue);
-			case NotationPackage.JUMP_LINK_TYPE:
-				return convertJumpLinkTypeToString(eDataType, instanceValue);
-			case NotationPackage.ALIGNMENT:
-				return convertAlignmentToString(eDataType, instanceValue);
-			case NotationPackage.SORTING_DIRECTION:
-				return convertSortingDirectionToString(eDataType, instanceValue);
-			case NotationPackage.MEASUREMENT_UNIT:
-				return convertMeasurementUnitToString(eDataType, instanceValue);
-			case NotationPackage.TEXT_ALIGNMENT:
-				return convertTextAlignmentToString(eDataType, instanceValue);
-			case NotationPackage.LINE_TYPE:
-				return convertLineTypeToString(eDataType, instanceValue);
-			case NotationPackage.ARROW_TYPE:
-				return convertArrowTypeToString(eDataType, instanceValue);
-			case NotationPackage.GRADIENT_STYLE:
-				return convertGradientStyleToString(eDataType, instanceValue);
-			case NotationPackage.RELATIVE_BENDPOINT_LIST:
-				return convertRelativeBendpointListToString(eDataType, instanceValue);
-			case NotationPackage.FILTER_KEY_LIST:
-				return convertFilterKeyListToString(eDataType, instanceValue);
-			case NotationPackage.SORT_KEY_MAP:
-				return convertSortKeyMapToString(eDataType, instanceValue);
-			case NotationPackage.GRADIENT_DATA:
-				return convertGradientDataToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		case NotationPackage.SORTING:
+			return convertSortingToString(eDataType, instanceValue);
+		case NotationPackage.FILTERING:
+			return convertFilteringToString(eDataType, instanceValue);
+		case NotationPackage.ROUTING:
+			return convertRoutingToString(eDataType, instanceValue);
+		case NotationPackage.SMOOTHNESS:
+			return convertSmoothnessToString(eDataType, instanceValue);
+		case NotationPackage.JUMP_LINK_STATUS:
+			return convertJumpLinkStatusToString(eDataType, instanceValue);
+		case NotationPackage.JUMP_LINK_TYPE:
+			return convertJumpLinkTypeToString(eDataType, instanceValue);
+		case NotationPackage.ALIGNMENT:
+			return convertAlignmentToString(eDataType, instanceValue);
+		case NotationPackage.SORTING_DIRECTION:
+			return convertSortingDirectionToString(eDataType, instanceValue);
+		case NotationPackage.MEASUREMENT_UNIT:
+			return convertMeasurementUnitToString(eDataType, instanceValue);
+		case NotationPackage.TEXT_ALIGNMENT:
+			return convertTextAlignmentToString(eDataType, instanceValue);
+		case NotationPackage.LINE_TYPE:
+			return convertLineTypeToString(eDataType, instanceValue);
+		case NotationPackage.ARROW_TYPE:
+			return convertArrowTypeToString(eDataType, instanceValue);
+		case NotationPackage.GRADIENT_STYLE:
+			return convertGradientStyleToString(eDataType, instanceValue);
+		case NotationPackage.RELATIVE_BENDPOINT_LIST:
+			return convertRelativeBendpointListToString(eDataType, instanceValue);
+		case NotationPackage.FILTER_KEY_LIST:
+			return convertFilterKeyListToString(eDataType, instanceValue);
+		case NotationPackage.SORT_KEY_MAP:
+			return convertSortKeyMapToString(eDataType, instanceValue);
+		case NotationPackage.GRADIENT_DATA:
+			return convertGradientDataToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Edge createEdge() {
@@ -308,9 +383,9 @@
 		return edge;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Node createNode() {
@@ -318,9 +393,9 @@
 		return node;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FillStyle createFillStyle() {
@@ -328,9 +403,9 @@
 		return fillStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LineStyle createLineStyle() {
@@ -338,9 +413,9 @@
 		return lineStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FontStyle createFontStyle() {
@@ -348,9 +423,9 @@
 		return fontStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TitleStyle createTitleStyle() {
@@ -358,9 +433,9 @@
 		return titleStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SortingStyle createSortingStyle() {
@@ -368,9 +443,9 @@
 		return sortingStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DescriptionStyle createDescriptionStyle() {
@@ -378,9 +453,9 @@
 		return descriptionStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Size createSize() {
@@ -388,9 +463,9 @@
 		return size;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Location createLocation() {
@@ -398,9 +473,9 @@
 		return location;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds createBounds() {
@@ -408,9 +483,9 @@
 		return bounds;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Ratio createRatio() {
@@ -418,9 +493,9 @@
 		return ratio;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IdentityAnchor createIdentityAnchor() {
@@ -428,9 +503,9 @@
 		return identityAnchor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RoutingStyle createRoutingStyle() {
@@ -438,9 +513,9 @@
 		return routingStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RelativeBendpoints createRelativeBendpoints() {
@@ -448,9 +523,9 @@
 		return relativeBendpoints;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CanonicalStyle createCanonicalStyle() {
@@ -458,9 +533,9 @@
 		return canonicalStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ShapeStyle createShapeStyle() {
@@ -468,9 +543,9 @@
 		return shapeStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ConnectorStyle createConnectorStyle() {
@@ -478,9 +553,9 @@
 		return connectorStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Diagram createDiagram() {
@@ -488,9 +563,9 @@
 		return diagram;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Image createImage() {
@@ -498,9 +573,9 @@
 		return image;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PageStyle createPageStyle() {
@@ -508,9 +583,9 @@
 		return pageStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DrawerStyle createDrawerStyle() {
@@ -518,9 +593,9 @@
 		return drawerStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GuideStyle createGuideStyle() {
@@ -528,9 +603,9 @@
 		return guideStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Guide createGuide() {
@@ -538,9 +613,9 @@
 		return guide;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Map.Entry createNodeEntry() {
@@ -548,9 +623,9 @@
 		return nodeEntry;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FilteringStyle createFilteringStyle() {
@@ -558,9 +633,9 @@
 		return filteringStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramStyle createDiagramStyle() {
@@ -568,9 +643,9 @@
 		return diagramStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ImageStyle createImageStyle() {
@@ -578,9 +653,9 @@
 		return imageStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ImageBufferStyle createImageBufferStyle() {
@@ -588,9 +663,9 @@
 		return imageBufferStyle;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PropertiesSetStyle createPropertiesSetStyle() {
@@ -598,9 +673,9 @@
 		return propertiesSetStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Map.Entry createStringToPropertyValueMapEntry() {
@@ -608,9 +683,9 @@
 		return stringToPropertyValueMapEntry;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PropertyValue createPropertyValue() {
@@ -618,9 +693,9 @@
 		return propertyValue;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SingleValueStyle createSingleValueStyle() {
@@ -628,9 +703,9 @@
 		return singleValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ListValueStyle createListValueStyle() {
@@ -638,9 +713,9 @@
 		return listValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedStyle createNamedStyle() {
@@ -648,9 +723,9 @@
 		return namedStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DataTypeStyle createDataTypeStyle() {
@@ -658,9 +733,9 @@
 		return dataTypeStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IntValueStyle createIntValueStyle() {
@@ -668,9 +743,9 @@
 		return intValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IntListValueStyle createIntListValueStyle() {
@@ -678,9 +753,9 @@
 		return intListValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BooleanValueStyle createBooleanValueStyle() {
@@ -688,9 +763,9 @@
 		return booleanValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DoubleValueStyle createDoubleValueStyle() {
@@ -698,9 +773,9 @@
 		return doubleValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DoubleListValueStyle createDoubleListValueStyle() {
@@ -708,9 +783,9 @@
 		return doubleListValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public StringValueStyle createStringValueStyle() {
@@ -718,9 +793,9 @@
 		return stringValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public StringListValueStyle createStringListValueStyle() {
@@ -728,9 +803,9 @@
 		return stringListValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EObjectValueStyle createEObjectValueStyle() {
@@ -738,9 +813,9 @@
 		return eObjectValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EObjectListValueStyle createEObjectListValueStyle() {
@@ -748,9 +823,9 @@
 		return eObjectListValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ByteArrayValueStyle createByteArrayValueStyle() {
@@ -758,9 +833,9 @@
 		return byteArrayValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BooleanListValueStyle createBooleanListValueStyle() {
@@ -768,9 +843,9 @@
 		return booleanListValueStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HintedDiagramLinkStyle createHintedDiagramLinkStyle() {
@@ -778,9 +853,9 @@
 		return hintedDiagramLinkStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramLinkStyle createDiagramLinkStyle() {
@@ -788,9 +863,9 @@
 		return diagramLinkStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MultiDiagramLinkStyle createMultiDiagramLinkStyle() {
@@ -798,9 +873,9 @@
 		return multiDiagramLinkStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TextStyle createTextStyle() {
@@ -808,9 +883,9 @@
 		return textStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LineTypeStyle createLineTypeStyle() {
@@ -818,9 +893,9 @@
 		return lineTypeStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArrowStyle createArrowStyle() {
@@ -829,8 +904,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Shape createShape() {
@@ -838,9 +913,9 @@
 		return shape;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Compartment createCompartment() {
@@ -848,9 +923,9 @@
 		return compartment;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ListCompartment createListCompartment() {
@@ -858,9 +933,9 @@
 		return listCompartment;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector createConnector() {
@@ -868,9 +943,9 @@
 		return connector;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public StandardDiagram createStandardDiagram() {
@@ -878,9 +953,9 @@
 		return standardDiagram;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DecorationNode createDecorationNode() {
@@ -888,9 +963,9 @@
 		return decorationNode;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BasicDecorationNode createBasicDecorationNode() {
@@ -898,9 +973,9 @@
 		return basicDecorationNode;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BasicCompartment createBasicCompartment() {
@@ -908,9 +983,9 @@
 		return basicCompartment;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BasicSemanticCompartment createBasicSemanticCompartment() {
@@ -918,9 +993,9 @@
 		return basicSemanticCompartment;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SemanticListCompartment createSemanticListCompartment() {
@@ -928,211 +1003,230 @@
 		return semanticListCompartment;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
 	 */
 	public RoundedCornersStyle createRoundedCornersStyle() {
 		RoundedCornersStyleImpl roundedCornersStyle = new RoundedCornersStyleImpl();
 		return roundedCornersStyle;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Sorting createSortingFromString(EDataType eDataType, String initialValue) {
+	public Sorting createSortingFromString(EDataType eDataType, String initialValue) {
 		Sorting result = Sorting.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public String convertSortingToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public Filtering createFilteringFromString(EDataType eDataType, String initialValue) {
-		Filtering result = Filtering.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String convertFilteringToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public Routing createRoutingFromString(EDataType eDataType, String initialValue) {
-		Routing result = Routing.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String convertRoutingToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public Smoothness createSmoothnessFromString(EDataType eDataType, String initialValue) {
-		Smoothness result = Smoothness.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String convertSmoothnessToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public JumpLinkStatus createJumpLinkStatusFromString(EDataType eDataType, String initialValue) {
-		JumpLinkStatus result = JumpLinkStatus.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String convertJumpLinkStatusToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public JumpLinkType createJumpLinkTypeFromString(EDataType eDataType, String initialValue) {
-		JumpLinkType result = JumpLinkType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String convertJumpLinkTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public Alignment createAlignmentFromString(EDataType eDataType, String initialValue) {
-		Alignment result = Alignment.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String convertAlignmentToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public SortingDirection createSortingDirectionFromString(EDataType eDataType, String initialValue) {
-		SortingDirection result = SortingDirection.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String convertSortingDirectionToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public MeasurementUnit createMeasurementUnitFromString(EDataType eDataType, String initialValue) {
-		MeasurementUnit result = MeasurementUnit.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String convertMeasurementUnitToString(EDataType eDataType, Object instanceValue) {
+	public String convertSortingToString(EDataType eDataType, Object instanceValue) {
 		return instanceValue == null ? null : instanceValue.toString();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Filtering createFilteringFromString(EDataType eDataType, String initialValue) {
+		Filtering result = Filtering.get(initialValue);
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String convertFilteringToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Routing createRoutingFromString(EDataType eDataType, String initialValue) {
+		Routing result = Routing.get(initialValue);
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String convertRoutingToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Smoothness createSmoothnessFromString(EDataType eDataType, String initialValue) {
+		Smoothness result = Smoothness.get(initialValue);
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String convertSmoothnessToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public JumpLinkStatus createJumpLinkStatusFromString(EDataType eDataType, String initialValue) {
+		JumpLinkStatus result = JumpLinkStatus.get(initialValue);
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String convertJumpLinkStatusToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public JumpLinkType createJumpLinkTypeFromString(EDataType eDataType, String initialValue) {
+		JumpLinkType result = JumpLinkType.get(initialValue);
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String convertJumpLinkTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Alignment createAlignmentFromString(EDataType eDataType, String initialValue) {
+		Alignment result = Alignment.get(initialValue);
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String convertAlignmentToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public SortingDirection createSortingDirectionFromString(EDataType eDataType, String initialValue) {
+		SortingDirection result = SortingDirection.get(initialValue);
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String convertSortingDirectionToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public MeasurementUnit createMeasurementUnitFromString(EDataType eDataType, String initialValue) {
+		MeasurementUnit result = MeasurementUnit.get(initialValue);
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String convertMeasurementUnitToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TextAlignment createTextAlignmentFromString(EDataType eDataType, String initialValue) {
 		TextAlignment result = TextAlignment.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertTextAlignmentToString(EDataType eDataType, Object instanceValue) {
@@ -1140,39 +1234,43 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LineType createLineTypeFromString(EDataType eDataType, String initialValue) {
 		LineType result = LineType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertLineTypeToString(EDataType eDataType, Object instanceValue) {
 		return instanceValue == null ? null : instanceValue.toString();
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArrowType createArrowTypeFromString(EDataType eDataType, String initialValue) {
 		ArrowType result = ArrowType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertArrowTypeToString(EDataType eDataType, Object instanceValue) {
@@ -1180,19 +1278,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GradientStyle createGradientStyleFromString(EDataType eDataType, String initialValue) {
 		GradientStyle result = GradientStyle.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if (result == null)
+			throw new IllegalArgumentException(
+					"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertGradientStyleToString(EDataType eDataType, Object instanceValue) {
@@ -1200,8 +1300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public List createRelativeBendpointListFromString(EDataType eDataType, String initialValue) {
@@ -1213,23 +1313,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public String convertRelativeBendpointListToString(EDataType eDataType, Object instanceValue) {
 		StringBuffer sb = new StringBuffer();
-		for (Iterator i = ((List)instanceValue).iterator(); i.hasNext();) {
+		for (Iterator i = ((List) instanceValue).iterator(); i.hasNext();) {
 			RelativeBendpoint point = (RelativeBendpoint) i.next();
-			if (sb.length() != 0) sb.append('$');
+			if (sb.length() != 0)
+				sb.append('$');
 			sb.append(point.convertToString());
 		}
 		return sb.toString();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public List createFilterKeyListFromString(EDataType eDataType, String initialValue) {
@@ -1241,23 +1342,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public String convertFilterKeyListToString(EDataType eDataType, Object instanceValue) {
 		StringBuffer sb = new StringBuffer();
-		for (Iterator i = ((List)instanceValue).iterator(); i.hasNext();) {
+		for (Iterator i = ((List) instanceValue).iterator(); i.hasNext();) {
 			String key = (String) i.next();
-			if (sb.length() != 0) sb.append(',');
+			if (sb.length() != 0)
+				sb.append(',');
 			sb.append(key);
 		}
 		return sb.toString();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public Map createSortKeyMapFromString(EDataType eDataType, String initialValue) {
@@ -1268,14 +1370,14 @@
 		while (st.hasMoreTokens()) {
 			s = st.nextToken().trim();
 			i = s.indexOf(':');
-			newMap.put(s.substring(0, i).trim(), SortingDirection.get(s.substring(i+1).trim()));
+			newMap.put(s.substring(0, i).trim(), SortingDirection.get(s.substring(i + 1).trim()));
 		}
 		return newMap;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public String convertSortKeyMapToString(EDataType eDataType, Object instanceValue) {
@@ -1284,15 +1386,16 @@
 		for (Iterator i = keyMap.keySet().iterator(); i.hasNext();) {
 			String key = (String) i.next();
 			SortingDirection direction = (SortingDirection) keyMap.get(key);
-			if (sb.length() != 0) sb.append(',');
+			if (sb.length() != 0)
+				sb.append(',');
 			sb.append(key + ":" + direction.getName()); //$NON-NLS-1$
 		}
 		return sb.toString();
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public GradientData createGradientDataFromString(EDataType eDataType, String initialValue) {
@@ -1303,33 +1406,35 @@
 			String s;
 			if (st.hasMoreTokens()) {
 				s = st.nextToken().trim();
- 			    try {
+				try {
 					gradient.setGradientColor1(Integer.parseInt(s));
-				} catch (NumberFormatException e) {}
+				} catch (NumberFormatException e) {
+				}
 			}
- 		    if (st.hasMoreTokens()) {
+			if (st.hasMoreTokens()) {
 				s = st.nextToken().trim();
 				try {
 					gradient.setGradientColor2(Integer.parseInt(s));
-				} catch (NumberFormatException e) {}
-			}			
+				} catch (NumberFormatException e) {
+				}
+			}
 			if (st.hasMoreTokens()) {
 				s = st.nextToken().trim();
 				try {
 					gradient.setGradientStyle(Integer.parseInt(s));
-				} catch (NumberFormatException e) {}
-			}	
+				} catch (NumberFormatException e) {
+				}
+			}
 		}
 		return gradient;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
-	public String convertGradientDataToString(EDataType eDataType,
-			Object instanceValue) {
+	public String convertGradientDataToString(EDataType eDataType, Object instanceValue) {
 		GradientData gradient = (GradientData) instanceValue;
 		if (gradient == null) {
 			return ""; //$NON-NLS-1$
@@ -1344,18 +1449,18 @@
 		}
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotationPackage getNotationPackage() {
-		return (NotationPackage)getEPackage();
+		return (NotationPackage) getEPackage();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -1363,4 +1468,4 @@
 		return NotationPackage.eINSTANCE;
 	}
 
-} //NotationFactoryImpl
+} // NotationFactoryImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationPackageImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationPackageImpl.java
index b35abef..3fcfe23 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationPackageImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationPackageImpl.java
@@ -112,632 +112,632 @@
 import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class NotationPackageImpl extends EPackageImpl implements NotationPackage {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass edgeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass nodeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass styleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass fillStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass lineStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass fontStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass titleStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass sortingStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass descriptionStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass layoutConstraintEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass sizeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass locationEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass boundsEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass ratioEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass anchorEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass bendpointsEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass identityAnchorEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass routingStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass viewEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass relativeBendpointsEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass diagramEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass imageEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass canonicalStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass shapeStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass connectorStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass pageStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass drawerStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass guideStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass guideEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass nodeEntryEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass filteringStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass diagramStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass imageStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass imageBufferStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass propertiesSetStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass stringToPropertyValueMapEntryEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass propertyValueEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass singleValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass listValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass namedStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass stringObjectConverterEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass dataTypeStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass intValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass intListValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass booleanValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass doubleValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass doubleListValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass stringValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass stringListValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eObjectValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eObjectListValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass byteArrayValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass booleanListValueStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hintedDiagramLinkStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass diagramLinkStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass multiDiagramLinkStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass textStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass lineTypeStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass arrowStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass shapeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass compartmentEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass listCompartmentEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass connectorEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass standardDiagramEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass decorationNodeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass basicDecorationNodeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass basicCompartmentEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass basicSemanticCompartmentEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass semanticListCompartmentEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	private EClass roundedCornersStyleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum sortingEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum filteringEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum routingEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum smoothnessEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum jumpLinkStatusEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum jumpLinkTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum alignmentEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum sortingDirectionEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum measurementUnitEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum textAlignmentEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum lineTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum arrowTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum gradientStyleEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType relativeBendpointListEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType filterKeyListEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType sortKeyMapEDataType = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType gradientDataEDataType = null;
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package package URI value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method
+	 * {@link #init init()}, which also performs initialization of the package, or
+	 * returns the registered package, if one already exists. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.gmf.runtime.notation.NotationPackage#eNS_URI
 	 * @see #init()
@@ -748,39 +748,41 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and
+	 * for any others upon which it depends. Simple dependencies are satisfied by
+	 * calling this method on all dependent packages before doing anything else.
+	 * This method drives initialization for interdependent packages directly, in
+	 * parallel with this package, itself.
+	 * <p>
+	 * Of this package and its interdependencies, all packages which have not yet
+	 * been registered by their URI values are first created and registered. The
+	 * packages are then initialized in two steps: meta-model objects for all of the
+	 * packages are created before any are initialized, since one package's
+	 * meta-model objects may refer to those of another.
+	 * <p>
+	 * Invocation of this method will not affect any packages that have already been
+	 * initialized. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static NotationPackage init() {
-		if (isInited) return (NotationPackage)EPackage.Registry.INSTANCE.getEPackage(NotationPackage.eNS_URI);
+		if (isInited)
+			return (NotationPackage) EPackage.Registry.INSTANCE.getEPackage(NotationPackage.eNS_URI);
 
 		// Obtain or create and register package
-		NotationPackageImpl theNotationPackage = (NotationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NotationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NotationPackageImpl());
+		NotationPackageImpl theNotationPackage = (NotationPackageImpl) (EPackage.Registry.INSTANCE
+				.getEPackage(eNS_URI) instanceof NotationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI)
+						: new NotationPackageImpl());
 
 		isInited = true;
 
@@ -795,15 +797,13 @@
 
 		// Mark meta-data to indicate it can't be changed
 		theNotationPackage.freeze();
-		
-		EPackage.Registry.INSTANCE.put(eNS_URI, theNotationPackage);
 
 		return theNotationPackage;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEdge() {
@@ -811,53 +811,53 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEdge_Source() {
-		return (EReference)edgeEClass.getEStructuralFeatures().get(0);
+		return (EReference) edgeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEdge_Target() {
-		return (EReference)edgeEClass.getEStructuralFeatures().get(1);
+		return (EReference) edgeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEdge_Bendpoints() {
-		return (EReference)edgeEClass.getEStructuralFeatures().get(2);
+		return (EReference) edgeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEdge_SourceAnchor() {
-		return (EReference)edgeEClass.getEStructuralFeatures().get(3);
+		return (EReference) edgeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEdge_TargetAnchor() {
-		return (EReference)edgeEClass.getEStructuralFeatures().get(4);
+		return (EReference) edgeEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getNode() {
@@ -865,17 +865,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getNode_LayoutConstraint() {
-		return (EReference)nodeEClass.getEStructuralFeatures().get(0);
+		return (EReference) nodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStyle() {
@@ -883,8 +883,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFillStyle() {
@@ -892,35 +892,35 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFillStyle_FillColor() {
-		return (EAttribute)fillStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) fillStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFillStyle_Transparency() {
-		return (EAttribute)fillStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) fillStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFillStyle_Gradient() {
-		return (EAttribute)fillStyleEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) fillStyleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getLineStyle() {
@@ -928,26 +928,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getLineStyle_LineColor() {
-		return (EAttribute)lineStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) lineStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getLineStyle_LineWidth() {
-		return (EAttribute)lineStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) lineStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFontStyle() {
@@ -955,71 +955,71 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFontStyle_FontColor() {
-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFontStyle_FontName() {
-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFontStyle_FontHeight() {
-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFontStyle_Bold() {
-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(3);
+		return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFontStyle_Italic() {
-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(4);
+		return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFontStyle_Underline() {
-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(5);
+		return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFontStyle_StrikeThrough() {
-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(6);
+		return (EAttribute) fontStyleEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTitleStyle() {
@@ -1027,17 +1027,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTitleStyle_ShowTitle() {
-		return (EAttribute)titleStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) titleStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSortingStyle() {
@@ -1045,35 +1045,35 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSortingStyle_Sorting() {
-		return (EAttribute)sortingStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) sortingStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSortingStyle_SortingKeys() {
-		return (EAttribute)sortingStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) sortingStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSortingStyle_SortedObjects() {
-		return (EReference)sortingStyleEClass.getEStructuralFeatures().get(2);
+		return (EReference) sortingStyleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDescriptionStyle() {
@@ -1081,17 +1081,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDescriptionStyle_Description() {
-		return (EAttribute)descriptionStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) descriptionStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getLayoutConstraint() {
@@ -1099,8 +1099,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSize() {
@@ -1108,26 +1108,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSize_Width() {
-		return (EAttribute)sizeEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) sizeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSize_Height() {
-		return (EAttribute)sizeEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) sizeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getLocation() {
@@ -1135,26 +1135,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getLocation_X() {
-		return (EAttribute)locationEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) locationEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getLocation_Y() {
-		return (EAttribute)locationEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) locationEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBounds() {
@@ -1162,8 +1162,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRatio() {
@@ -1171,17 +1171,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRatio_Value() {
-		return (EAttribute)ratioEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) ratioEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getAnchor() {
@@ -1189,8 +1189,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBendpoints() {
@@ -1198,8 +1198,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getIdentityAnchor() {
@@ -1207,17 +1207,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIdentityAnchor_Id() {
-		return (EAttribute)identityAnchorEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) identityAnchorEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRoutingStyle() {
@@ -1225,70 +1225,71 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRoutingStyle_Routing() {
-		return (EAttribute)routingStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) routingStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRoutingStyle_Smoothness() {
-		return (EAttribute)routingStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) routingStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRoutingStyle_AvoidObstructions() {
-		return (EAttribute)routingStyleEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) routingStyleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRoutingStyle_ClosestDistance() {
-		return (EAttribute)routingStyleEClass.getEStructuralFeatures().get(3);
+		return (EAttribute) routingStyleEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRoutingStyle_JumpLinkStatus() {
-		return (EAttribute)routingStyleEClass.getEStructuralFeatures().get(4);
+		return (EAttribute) routingStyleEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRoutingStyle_JumpLinkType() {
-		return (EAttribute)routingStyleEClass.getEStructuralFeatures().get(5);
+		return (EAttribute) routingStyleEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRoutingStyle_JumpLinksReverse() {
-		return (EAttribute)routingStyleEClass.getEStructuralFeatures().get(6);
+		return (EAttribute) routingStyleEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
 	 * Left in for backwards compatibility
+	 * 
 	 * @deprecated Use getRoundedCornersStyle_RoundedBendpointsRadius()
 	 */
 	public EAttribute getRoutingStyle_RoundedBendpointsRadius() {
@@ -1296,8 +1297,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getView() {
@@ -1305,98 +1306,98 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getView_Visible() {
-		return (EAttribute)viewEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) viewEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getView_Type() {
-		return (EAttribute)viewEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) viewEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getView_Mutable() {
-		return (EAttribute)viewEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) viewEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getView_SourceEdges() {
-		return (EReference)viewEClass.getEStructuralFeatures().get(3);
+		return (EReference) viewEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getView_TargetEdges() {
-		return (EReference)viewEClass.getEStructuralFeatures().get(4);
+		return (EReference) viewEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getView_PersistedChildren() {
-		return (EReference)viewEClass.getEStructuralFeatures().get(5);
+		return (EReference) viewEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getView_Styles() {
-		return (EReference)viewEClass.getEStructuralFeatures().get(6);
+		return (EReference) viewEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getView_Element() {
-		return (EReference)viewEClass.getEStructuralFeatures().get(7);
+		return (EReference) viewEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getView_Diagram() {
-		return (EReference)viewEClass.getEStructuralFeatures().get(8);
+		return (EReference) viewEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getView_TransientChildren() {
-		return (EReference)viewEClass.getEStructuralFeatures().get(9);
+		return (EReference) viewEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRelativeBendpoints() {
@@ -1404,17 +1405,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRelativeBendpoints_Points() {
-		return (EAttribute)relativeBendpointsEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) relativeBendpointsEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDiagram() {
@@ -1422,44 +1423,44 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDiagram_Name() {
-		return (EAttribute)diagramEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) diagramEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDiagram_MeasurementUnit() {
-		return (EAttribute)diagramEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) diagramEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagram_PersistedEdges() {
-		return (EReference)diagramEClass.getEStructuralFeatures().get(2);
+		return (EReference) diagramEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagram_TransientEdges() {
-		return (EReference)diagramEClass.getEStructuralFeatures().get(3);
+		return (EReference) diagramEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getImage() {
@@ -1467,17 +1468,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getImage_Data() {
-		return (EAttribute)imageEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) imageEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCanonicalStyle() {
@@ -1485,17 +1486,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getCanonicalStyle_Canonical() {
-		return (EAttribute)canonicalStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) canonicalStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getShapeStyle() {
@@ -1503,8 +1504,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getConnectorStyle() {
@@ -1512,8 +1513,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPageStyle() {
@@ -1521,44 +1522,44 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPageStyle_PageX() {
-		return (EAttribute)pageStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) pageStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPageStyle_PageY() {
-		return (EAttribute)pageStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) pageStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPageStyle_PageWidth() {
-		return (EAttribute)pageStyleEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) pageStyleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPageStyle_PageHeight() {
-		return (EAttribute)pageStyleEClass.getEStructuralFeatures().get(3);
+		return (EAttribute) pageStyleEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDrawerStyle() {
@@ -1566,17 +1567,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDrawerStyle_Collapsed() {
-		return (EAttribute)drawerStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) drawerStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGuideStyle() {
@@ -1584,26 +1585,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGuideStyle_HorizontalGuides() {
-		return (EReference)guideStyleEClass.getEStructuralFeatures().get(0);
+		return (EReference) guideStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGuideStyle_VerticalGuides() {
-		return (EReference)guideStyleEClass.getEStructuralFeatures().get(1);
+		return (EReference) guideStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGuide() {
@@ -1611,26 +1612,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGuide_Position() {
-		return (EAttribute)guideEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) guideEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGuide_NodeMap() {
-		return (EReference)guideEClass.getEStructuralFeatures().get(1);
+		return (EReference) guideEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getNodeEntry() {
@@ -1638,26 +1639,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNodeEntry_Value() {
-		return (EAttribute)nodeEntryEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) nodeEntryEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getNodeEntry_Key() {
-		return (EReference)nodeEntryEClass.getEStructuralFeatures().get(1);
+		return (EReference) nodeEntryEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFilteringStyle() {
@@ -1665,35 +1666,35 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFilteringStyle_Filtering() {
-		return (EAttribute)filteringStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) filteringStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFilteringStyle_FilteringKeys() {
-		return (EAttribute)filteringStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) filteringStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFilteringStyle_FilteredObjects() {
-		return (EReference)filteringStyleEClass.getEStructuralFeatures().get(2);
+		return (EReference) filteringStyleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDiagramStyle() {
@@ -1701,8 +1702,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getImageStyle() {
@@ -1710,35 +1711,35 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getImageStyle_AntiAlias() {
-		return (EAttribute)imageStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) imageStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getImageStyle_MaintainAspectRatio() {
-		return (EAttribute)imageStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) imageStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getImageStyle_CropBound() {
-		return (EReference)imageStyleEClass.getEStructuralFeatures().get(2);
+		return (EReference) imageStyleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getImageBufferStyle() {
@@ -1746,17 +1747,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getImageBufferStyle_ImageBuffer() {
-		return (EReference)imageBufferStyleEClass.getEStructuralFeatures().get(0);
+		return (EReference) imageBufferStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPropertiesSetStyle() {
@@ -1764,17 +1765,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPropertiesSetStyle_PropertiesMap() {
-		return (EReference)propertiesSetStyleEClass.getEStructuralFeatures().get(0);
+		return (EReference) propertiesSetStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStringToPropertyValueMapEntry() {
@@ -1782,26 +1783,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStringToPropertyValueMapEntry_Key() {
-		return (EAttribute)stringToPropertyValueMapEntryEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) stringToPropertyValueMapEntryEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStringToPropertyValueMapEntry_Value() {
-		return (EReference)stringToPropertyValueMapEntryEClass.getEStructuralFeatures().get(1);
+		return (EReference) stringToPropertyValueMapEntryEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPropertyValue() {
@@ -1809,26 +1810,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPropertyValue_RawValue() {
-		return (EAttribute)propertyValueEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) propertyValueEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPropertyValue_InstanceType() {
-		return (EReference)propertyValueEClass.getEStructuralFeatures().get(1);
+		return (EReference) propertyValueEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSingleValueStyle() {
@@ -1836,17 +1837,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSingleValueStyle_RawValue() {
-		return (EAttribute)singleValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) singleValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getListValueStyle() {
@@ -1854,17 +1855,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getListValueStyle_RawValuesList() {
-		return (EAttribute)listValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) listValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getNamedStyle() {
@@ -1872,17 +1873,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNamedStyle_Name() {
-		return (EAttribute)namedStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) namedStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStringObjectConverter() {
@@ -1890,8 +1891,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDataTypeStyle() {
@@ -1899,17 +1900,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDataTypeStyle_InstanceType() {
-		return (EReference)dataTypeStyleEClass.getEStructuralFeatures().get(0);
+		return (EReference) dataTypeStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getIntValueStyle() {
@@ -1917,17 +1918,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIntValueStyle_IntValue() {
-		return (EAttribute)intValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) intValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getIntListValueStyle() {
@@ -1935,17 +1936,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIntListValueStyle_IntListValue() {
-		return (EAttribute)intListValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) intListValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBooleanValueStyle() {
@@ -1953,17 +1954,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getBooleanValueStyle_BooleanValue() {
-		return (EAttribute)booleanValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) booleanValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDoubleValueStyle() {
@@ -1971,17 +1972,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDoubleValueStyle_DoubleValue() {
-		return (EAttribute)doubleValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) doubleValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDoubleListValueStyle() {
@@ -1989,17 +1990,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDoubleListValueStyle_DoubleListValue() {
-		return (EAttribute)doubleListValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) doubleListValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStringValueStyle() {
@@ -2007,17 +2008,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStringValueStyle_StringValue() {
-		return (EAttribute)stringValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) stringValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStringListValueStyle() {
@@ -2025,17 +2026,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStringListValueStyle_StringListValue() {
-		return (EAttribute)stringListValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) stringListValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEObjectValueStyle() {
@@ -2043,17 +2044,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEObjectValueStyle_EObjectValue() {
-		return (EReference)eObjectValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EReference) eObjectValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEObjectListValueStyle() {
@@ -2061,17 +2062,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEObjectListValueStyle_EObjectListValue() {
-		return (EReference)eObjectListValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EReference) eObjectListValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getByteArrayValueStyle() {
@@ -2079,17 +2080,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getByteArrayValueStyle_ByteArrayValue() {
-		return (EAttribute)byteArrayValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) byteArrayValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBooleanListValueStyle() {
@@ -2097,17 +2098,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getBooleanListValueStyle_BooleanListValue() {
-		return (EAttribute)booleanListValueStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) booleanListValueStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHintedDiagramLinkStyle() {
@@ -2115,17 +2116,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHintedDiagramLinkStyle_Hint() {
-		return (EAttribute)hintedDiagramLinkStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) hintedDiagramLinkStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDiagramLinkStyle() {
@@ -2133,17 +2134,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagramLinkStyle_DiagramLink() {
-		return (EReference)diagramLinkStyleEClass.getEStructuralFeatures().get(0);
+		return (EReference) diagramLinkStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMultiDiagramLinkStyle() {
@@ -2151,17 +2152,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMultiDiagramLinkStyle_DiagramLinks() {
-		return (EReference)multiDiagramLinkStyleEClass.getEStructuralFeatures().get(0);
+		return (EReference) multiDiagramLinkStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTextStyle() {
@@ -2169,17 +2170,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTextStyle_TextAlignment() {
-		return (EAttribute)textStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) textStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getLineTypeStyle() {
@@ -2187,17 +2188,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getLineTypeStyle_LineType() {
-		return (EAttribute)lineTypeStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) lineTypeStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getArrowStyle() {
@@ -2205,26 +2206,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getArrowStyle_ArrowSource() {
-		return (EAttribute)arrowStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) arrowStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getArrowStyle_ArrowTarget() {
-		return (EAttribute)arrowStyleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) arrowStyleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getShape() {
@@ -2232,8 +2233,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCompartment() {
@@ -2241,8 +2242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getListCompartment() {
@@ -2250,8 +2251,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getConnector() {
@@ -2259,8 +2260,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStandardDiagram() {
@@ -2268,8 +2269,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDecorationNode() {
@@ -2277,8 +2278,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBasicDecorationNode() {
@@ -2286,8 +2287,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBasicCompartment() {
@@ -2295,8 +2296,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBasicSemanticCompartment() {
@@ -2304,8 +2305,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSemanticListCompartment() {
@@ -2313,38 +2314,38 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public EClass getRoundedCornersStyle() {
 		return roundedCornersStyleEClass;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public EAttribute getRoundedCornersStyle_RoundedBendpointsRadius() {
-		return (EAttribute)roundedCornersStyleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) roundedCornersStyleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public EEnum getSorting() {
 		return sortingEEnum;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getFiltering() {
@@ -2352,8 +2353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getRouting() {
@@ -2361,8 +2362,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getSmoothness() {
@@ -2370,8 +2371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getJumpLinkStatus() {
@@ -2379,8 +2380,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getJumpLinkType() {
@@ -2388,8 +2389,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getAlignment() {
@@ -2397,8 +2398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getSortingDirection() {
@@ -2406,8 +2407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getMeasurementUnit() {
@@ -2415,8 +2416,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getTextAlignment() {
@@ -2424,8 +2425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getLineType() {
@@ -2433,8 +2434,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getArrowType() {
@@ -2442,8 +2443,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getGradientStyle() {
@@ -2451,8 +2452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getRelativeBendpointList() {
@@ -2460,8 +2461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getFilterKeyList() {
@@ -2469,8 +2470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getSortKeyMap() {
@@ -2478,8 +2479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getGradientData() {
@@ -2487,30 +2488,31 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotationFactory getNotationFactory() {
-		return (NotationFactory)getEFactoryInstance();
+		return (NotationFactory) getEFactoryInstance();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates the meta-model objects for the package. This method is guarded to
+	 * have no affect on any invocation but its first. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if (isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -2776,21 +2778,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Complete the initialization of the package and its meta-model. This method is
+	 * guarded to have no affect on any invocation but its first. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if (isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
@@ -2799,7 +2802,7 @@
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
 		// Add supertypes to classes
 		edgeEClass.getESuperTypes().add(this.getView());
@@ -2889,16 +2892,26 @@
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(edgeEClass, Edge.class, "Edge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getEdge_Source(), this.getView(), this.getView_SourceEdges(), "source", null, 1, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getEdge_Target(), this.getView(), this.getView_TargetEdges(), "target", null, 1, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getEdge_Bendpoints(), this.getBendpoints(), null, "bendpoints", null, 0, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getEdge_SourceAnchor(), this.getAnchor(), null, "sourceAnchor", null, 0, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getEdge_TargetAnchor(), this.getAnchor(), null, "targetAnchor", null, 0, 1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEReference(getEdge_Source(), this.getView(), this.getView_SourceEdges(), "source", null, 1, 1, Edge.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getEdge_Target(), this.getView(), this.getView_TargetEdges(), "target", null, 1, 1, Edge.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getEdge_Bendpoints(), this.getBendpoints(), null, "bendpoints", null, 0, 1, Edge.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getEdge_SourceAnchor(), this.getAnchor(), null, "sourceAnchor", null, 0, 1, Edge.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getEdge_TargetAnchor(), this.getAnchor(), null, "targetAnchor", null, 0, 1, Edge.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		EOperation op = addEOperation(edgeEClass, this.getBendpoints(), "createBendpoints", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1); //$NON-NLS-1$
@@ -2910,95 +2923,168 @@
 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1); //$NON-NLS-1$
 
 		initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getNode_LayoutConstraint(), this.getLayoutConstraint(), null, "layoutConstraint", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEReference(getNode_LayoutConstraint(), this.getLayoutConstraint(), null, "layoutConstraint", null, 0, 1, //$NON-NLS-1$
+				Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		op = addEOperation(nodeEClass, this.getLayoutConstraint(), "createLayoutConstraint", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1); //$NON-NLS-1$
 
 		initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(fillStyleEClass, FillStyle.class, "FillStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getFillStyle_FillColor(), ecorePackage.getEInt(), "fillColor", "16777215", 0, 1, FillStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFillStyle_Transparency(), ecorePackage.getEInt(), "transparency", "-1", 0, 1, FillStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFillStyle_Gradient(), this.getGradientData(), "gradient", null, 0, 1, FillStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(fillStyleEClass, FillStyle.class, "FillStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFillStyle_FillColor(), ecorePackage.getEInt(), "fillColor", "16777215", 0, 1, FillStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFillStyle_Transparency(), ecorePackage.getEInt(), "transparency", "-1", 0, 1, FillStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFillStyle_Gradient(), this.getGradientData(), "gradient", null, 0, 1, FillStyle.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(lineStyleEClass, LineStyle.class, "LineStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getLineStyle_LineColor(), ecorePackage.getEInt(), "lineColor", "11579568", 0, 1, LineStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getLineStyle_LineWidth(), theEcorePackage.getEInt(), "lineWidth", "-1", 0, 1, LineStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(lineStyleEClass, LineStyle.class, "LineStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getLineStyle_LineColor(), ecorePackage.getEInt(), "lineColor", "11579568", 0, 1, LineStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getLineStyle_LineWidth(), theEcorePackage.getEInt(), "lineWidth", "-1", 0, 1, LineStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(fontStyleEClass, FontStyle.class, "FontStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getFontStyle_FontColor(), ecorePackage.getEInt(), "fontColor", "0", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFontStyle_FontName(), ecorePackage.getEString(), "fontName", "Tahoma", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFontStyle_FontHeight(), ecorePackage.getEInt(), "fontHeight", "9", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFontStyle_Bold(), ecorePackage.getEBoolean(), "bold", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFontStyle_Italic(), ecorePackage.getEBoolean(), "italic", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFontStyle_Underline(), ecorePackage.getEBoolean(), "underline", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFontStyle_StrikeThrough(), ecorePackage.getEBoolean(), "strikeThrough", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(fontStyleEClass, FontStyle.class, "FontStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFontStyle_FontColor(), ecorePackage.getEInt(), "fontColor", "0", 0, 1, FontStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFontStyle_FontName(), ecorePackage.getEString(), "fontName", "Tahoma", 0, 1, FontStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFontStyle_FontHeight(), ecorePackage.getEInt(), "fontHeight", "9", 0, 1, FontStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFontStyle_Bold(), ecorePackage.getEBoolean(), "bold", "false", 0, 1, FontStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFontStyle_Italic(), ecorePackage.getEBoolean(), "italic", "false", 0, 1, FontStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFontStyle_Underline(), ecorePackage.getEBoolean(), "underline", "false", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFontStyle_StrikeThrough(), ecorePackage.getEBoolean(), "strikeThrough", "false", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(titleStyleEClass, TitleStyle.class, "TitleStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getTitleStyle_ShowTitle(), ecorePackage.getEBoolean(), "showTitle", "false", 0, 1, TitleStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(titleStyleEClass, TitleStyle.class, "TitleStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTitleStyle_ShowTitle(), ecorePackage.getEBoolean(), "showTitle", "false", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				TitleStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(sortingStyleEClass, SortingStyle.class, "SortingStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getSortingStyle_Sorting(), this.getSorting(), "sorting", "None", 0, 1, SortingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getSortingStyle_SortingKeys(), this.getSortKeyMap(), "sortingKeys", null, 0, 1, SortingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getSortingStyle_SortedObjects(), theEcorePackage.getEObject(), null, "sortedObjects", null, 0, -1, SortingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(sortingStyleEClass, SortingStyle.class, "SortingStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getSortingStyle_Sorting(), this.getSorting(), "sorting", "None", 0, 1, SortingStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSortingStyle_SortingKeys(), this.getSortKeyMap(), "sortingKeys", null, 0, 1, //$NON-NLS-1$
+				SortingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(descriptionStyleEClass, DescriptionStyle.class, "DescriptionStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDescriptionStyle_Description(), ecorePackage.getEString(), "description", "", 0, 1, DescriptionStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getSortingStyle_SortedObjects(), theEcorePackage.getEObject(), null, "sortedObjects", null, 0, //$NON-NLS-1$
+				-1, SortingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(layoutConstraintEClass, LayoutConstraint.class, "LayoutConstraint", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(descriptionStyleEClass, DescriptionStyle.class, "DescriptionStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDescriptionStyle_Description(), ecorePackage.getEString(), "description", "", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				DescriptionStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(layoutConstraintEClass, LayoutConstraint.class, "LayoutConstraint", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(sizeEClass, Size.class, "Size", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getSize_Width(), ecorePackage.getEInt(), "width", "-1", 0, 1, Size.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getSize_Height(), ecorePackage.getEInt(), "height", "-1", 0, 1, Size.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getSize_Width(), ecorePackage.getEInt(), "width", "-1", 0, 1, Size.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSize_Height(), ecorePackage.getEInt(), "height", "-1", 0, 1, Size.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(locationEClass, Location.class, "Location", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getLocation_X(), ecorePackage.getEInt(), "x", "0", 0, 1, Location.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getLocation_Y(), ecorePackage.getEInt(), "y", "0", 0, 1, Location.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(locationEClass, Location.class, "Location", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getLocation_X(), ecorePackage.getEInt(), "x", "0", 0, 1, Location.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getLocation_Y(), ecorePackage.getEInt(), "y", "0", 0, 1, Location.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(boundsEClass, Bounds.class, "Bounds", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
 		initEClass(ratioEClass, Ratio.class, "Ratio", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getRatio_Value(), ecorePackage.getEDouble(), "value", "-1", 0, 1, Ratio.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getRatio_Value(), ecorePackage.getEDouble(), "value", "-1", 0, 1, Ratio.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(anchorEClass, Anchor.class, "Anchor", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(bendpointsEClass, Bendpoints.class, "Bendpoints", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(bendpointsEClass, Bendpoints.class, "Bendpoints", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(identityAnchorEClass, IdentityAnchor.class, "IdentityAnchor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getIdentityAnchor_Id(), ecorePackage.getEString(), "id", "anchor", 0, 1, IdentityAnchor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(identityAnchorEClass, IdentityAnchor.class, "IdentityAnchor", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIdentityAnchor_Id(), ecorePackage.getEString(), "id", "anchor", 0, 1, IdentityAnchor.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(routingStyleEClass, RoutingStyle.class, "RoutingStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getRoutingStyle_Routing(), this.getRouting(), "routing", "Manual", 0, 1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getRoutingStyle_Smoothness(), this.getSmoothness(), "smoothness", "None", 0, 1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getRoutingStyle_AvoidObstructions(), ecorePackage.getEBoolean(), "avoidObstructions", "false", 0, 1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getRoutingStyle_ClosestDistance(), ecorePackage.getEBoolean(), "closestDistance", "false", 0, 1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getRoutingStyle_JumpLinkStatus(), this.getJumpLinkStatus(), "jumpLinkStatus", "None", 0, 1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getRoutingStyle_JumpLinkType(), this.getJumpLinkType(), "jumpLinkType", "Semicircle", 0, 1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getRoutingStyle_JumpLinksReverse(), ecorePackage.getEBoolean(), "jumpLinksReverse", "false", 0, 1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(routingStyleEClass, RoutingStyle.class, "RoutingStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRoutingStyle_Routing(), this.getRouting(), "routing", "Manual", 0, 1, RoutingStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRoutingStyle_Smoothness(), this.getSmoothness(), "smoothness", "None", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRoutingStyle_AvoidObstructions(), ecorePackage.getEBoolean(), "avoidObstructions", "false", 0, //$NON-NLS-1$ //$NON-NLS-2$
+				1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRoutingStyle_ClosestDistance(), ecorePackage.getEBoolean(), "closestDistance", "false", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRoutingStyle_JumpLinkStatus(), this.getJumpLinkStatus(), "jumpLinkStatus", "None", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRoutingStyle_JumpLinkType(), this.getJumpLinkType(), "jumpLinkType", "Semicircle", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRoutingStyle_JumpLinksReverse(), ecorePackage.getEBoolean(), "jumpLinksReverse", "false", 0, //$NON-NLS-1$ //$NON-NLS-2$
+				1, RoutingStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
 		initEClass(viewEClass, View.class, "View", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getView_Visible(), ecorePackage.getEBoolean(), "visible", "true", 0, 1, View.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getView_Type(), ecorePackage.getEString(), "type", "", 0, 1, View.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getView_Mutable(), ecorePackage.getEBoolean(), "mutable", "false", 0, 1, View.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		  
-		initEReference(getView_SourceEdges(), this.getEdge(), this.getEdge_Source(), "sourceEdges", null, 0, -1, View.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getView_TargetEdges(), this.getEdge(), this.getEdge_Target(), "targetEdges", null, 0, -1, View.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-			initEReference(getView_PersistedChildren(), this.getNode(), null, "children", null, 0, -1, View.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-			initEReference(getView_PersistedChildren(), this.getNode(), null, "children", null, 0, -1, View.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		  
-		initEReference(getView_Styles(), this.getStyle(), null, "styles", null, 0, -1, View.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getView_Element(), theEcorePackage.getEObject(), null, "element", null, 0, 1, View.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getView_Diagram(), this.getDiagram(), null, "diagram", null, 1, 1, View.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getView_TransientChildren(), this.getNode(), null, "transientChildren", null, 0, -1, View.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getView_Visible(), ecorePackage.getEBoolean(), "visible", "true", 0, 1, View.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getView_Type(), ecorePackage.getEString(), "type", "", 0, 1, View.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getView_Mutable(), ecorePackage.getEBoolean(), "mutable", "false", 0, 1, View.class, //$NON-NLS-1$ //$NON-NLS-2$
+				IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getView_SourceEdges(), this.getEdge(), this.getEdge_Source(), "sourceEdges", null, 0, -1, //$NON-NLS-1$
+				View.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getView_TargetEdges(), this.getEdge(), this.getEdge_Target(), "targetEdges", null, 0, -1, //$NON-NLS-1$
+				View.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getView_PersistedChildren(), this.getNode(), null, "children", null, 0, -1, View.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getView_PersistedChildren(), this.getNode(), null, "children", null, 0, -1, View.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getView_Styles(), this.getStyle(), null, "styles", null, 0, -1, View.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEReference(getView_Element(), theEcorePackage.getEObject(), null, "element", null, 0, 1, View.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEReference(getView_Diagram(), this.getDiagram(), null, "diagram", null, 1, 1, View.class, IS_TRANSIENT, //$NON-NLS-1$
+				IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEReference(getView_TransientChildren(), this.getNode(), null, "transientChildren", null, 0, -1, View.class, //$NON-NLS-1$
+				IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
 		op = addEOperation(viewEClass, this.getStyle(), "getStyle", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1); //$NON-NLS-1$
@@ -3013,77 +3099,133 @@
 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
 
-		initEClass(relativeBendpointsEClass, RelativeBendpoints.class, "RelativeBendpoints", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getRelativeBendpoints_Points(), this.getRelativeBendpointList(), "points", null, 0, 1, RelativeBendpoints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(relativeBendpointsEClass, RelativeBendpoints.class, "RelativeBendpoints", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRelativeBendpoints_Points(), this.getRelativeBendpointList(), "points", null, 0, 1, //$NON-NLS-1$
+				RelativeBendpoints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
 		initEClass(diagramEClass, Diagram.class, "Diagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDiagram_Name(), ecorePackage.getEString(), "name", "", 0, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getDiagram_MeasurementUnit(), this.getMeasurementUnit(), "measurementUnit", "Himetric", 0, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		  
-			initEReference(getDiagram_PersistedEdges(), this.getEdge(), null, "edges", null, 0, -1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		  
-		initEReference(getDiagram_TransientEdges(), this.getEdge(), null, "TransientEdges", null, 0, -1, Diagram.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getDiagram_Name(), ecorePackage.getEString(), "name", "", 0, 1, Diagram.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDiagram_MeasurementUnit(), this.getMeasurementUnit(), "measurementUnit", "Himetric", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEReference(getDiagram_PersistedEdges(), this.getEdge(), null, "edges", null, 0, -1, Diagram.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getDiagram_TransientEdges(), this.getEdge(), null, "TransientEdges", null, 0, -1, Diagram.class, //$NON-NLS-1$
+				IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
 		op = addEOperation(diagramEClass, this.getEdge(), "createEdge", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1); //$NON-NLS-1$
 
 		initEClass(imageEClass, Image.class, "Image", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getImage_Data(), theEcorePackage.getEByteArray(), "data", null, 0, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getImage_Data(), theEcorePackage.getEByteArray(), "data", null, 0, 1, Image.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(canonicalStyleEClass, CanonicalStyle.class, "CanonicalStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getCanonicalStyle_Canonical(), ecorePackage.getEBoolean(), "canonical", "true", 0, 1, CanonicalStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(canonicalStyleEClass, CanonicalStyle.class, "CanonicalStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCanonicalStyle_Canonical(), ecorePackage.getEBoolean(), "canonical", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				CanonicalStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(shapeStyleEClass, ShapeStyle.class, "ShapeStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(shapeStyleEClass, ShapeStyle.class, "ShapeStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(connectorStyleEClass, ConnectorStyle.class, "ConnectorStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(connectorStyleEClass, ConnectorStyle.class, "ConnectorStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(pageStyleEClass, PageStyle.class, "PageStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getPageStyle_PageX(), ecorePackage.getEInt(), "pageX", "0", 0, 1, PageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getPageStyle_PageY(), ecorePackage.getEInt(), "pageY", "0", 0, 1, PageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getPageStyle_PageWidth(), ecorePackage.getEInt(), "pageWidth", "100", 0, 1, PageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getPageStyle_PageHeight(), ecorePackage.getEInt(), "pageHeight", "100", 0, 1, PageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(pageStyleEClass, PageStyle.class, "PageStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPageStyle_PageX(), ecorePackage.getEInt(), "pageX", "0", 0, 1, PageStyle.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPageStyle_PageY(), ecorePackage.getEInt(), "pageY", "0", 0, 1, PageStyle.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPageStyle_PageWidth(), ecorePackage.getEInt(), "pageWidth", "100", 0, 1, PageStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPageStyle_PageHeight(), ecorePackage.getEInt(), "pageHeight", "100", 0, 1, PageStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(drawerStyleEClass, DrawerStyle.class, "DrawerStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDrawerStyle_Collapsed(), ecorePackage.getEBoolean(), "collapsed", "false", 0, 1, DrawerStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(drawerStyleEClass, DrawerStyle.class, "DrawerStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDrawerStyle_Collapsed(), ecorePackage.getEBoolean(), "collapsed", "false", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				DrawerStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(guideStyleEClass, GuideStyle.class, "GuideStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getGuideStyle_HorizontalGuides(), this.getGuide(), null, "horizontalGuides", null, 0, -1, GuideStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getGuideStyle_VerticalGuides(), this.getGuide(), null, "verticalGuides", null, 0, -1, GuideStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(guideStyleEClass, GuideStyle.class, "GuideStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+
+		initEReference(getGuideStyle_HorizontalGuides(), this.getGuide(), null, "horizontalGuides", null, 0, -1, //$NON-NLS-1$
+				GuideStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getGuideStyle_VerticalGuides(), this.getGuide(), null, "verticalGuides", null, 0, -1, //$NON-NLS-1$
+				GuideStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(guideEClass, Guide.class, "Guide", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getGuide_Position(), ecorePackage.getEInt(), "position", "0", 0, 1, Guide.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		  
-		initEReference(getGuide_NodeMap(), this.getNodeEntry(), null, "nodeMap", null, 0, -1, Guide.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getGuide_Position(), ecorePackage.getEInt(), "position", "0", 0, 1, Guide.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(nodeEntryEClass, Map.Entry.class, "NodeEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getNodeEntry_Value(), this.getAlignment(), "value", "Center", 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		  
-		initEReference(getNodeEntry_Key(), this.getNode(), null, "key", null, 1, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getGuide_NodeMap(), this.getNodeEntry(), null, "nodeMap", null, 0, -1, Guide.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(filteringStyleEClass, FilteringStyle.class, "FilteringStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getFilteringStyle_Filtering(), this.getFiltering(), "filtering", "None", 0, 1, FilteringStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFilteringStyle_FilteringKeys(), this.getFilterKeyList(), "filteringKeys", null, 0, 1, FilteringStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getFilteringStyle_FilteredObjects(), theEcorePackage.getEObject(), null, "filteredObjects", null, 0, -1, FilteringStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(nodeEntryEClass, Map.Entry.class, "NodeEntry", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				!IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getNodeEntry_Value(), this.getAlignment(), "value", "Center", 0, 1, Map.Entry.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(diagramStyleEClass, DiagramStyle.class, "DiagramStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getNodeEntry_Key(), this.getNode(), null, "key", null, 1, 1, Map.Entry.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
 
-		initEClass(imageStyleEClass, ImageStyle.class, "ImageStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getImageStyle_AntiAlias(), ecorePackage.getEBooleanObject(), "antiAlias", "true", 0, 1, ImageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getImageStyle_MaintainAspectRatio(), ecorePackage.getEBooleanObject(), "maintainAspectRatio", "true", 0, 1, ImageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		  
-		initEReference(getImageStyle_CropBound(), this.getBounds(), null, "cropBound", null, 1, 1, ImageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(filteringStyleEClass, FilteringStyle.class, "FilteringStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFilteringStyle_Filtering(), this.getFiltering(), "filtering", "None", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				FilteringStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFilteringStyle_FilteringKeys(), this.getFilterKeyList(), "filteringKeys", null, 0, 1, //$NON-NLS-1$
+				FilteringStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(imageBufferStyleEClass, ImageBufferStyle.class, "ImageBufferStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getImageBufferStyle_ImageBuffer(), this.getImage(), null, "imageBuffer", null, 1, 1, ImageBufferStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getFilteringStyle_FilteredObjects(), theEcorePackage.getEObject(), null, "filteredObjects", null, //$NON-NLS-1$
+				0, -1, FilteringStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(propertiesSetStyleEClass, PropertiesSetStyle.class, "PropertiesSetStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getPropertiesSetStyle_PropertiesMap(), this.getStringToPropertyValueMapEntry(), null, "propertiesMap", null, 0, -1, PropertiesSetStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(diagramStyleEClass, DiagramStyle.class, "DiagramStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(imageStyleEClass, ImageStyle.class, "ImageStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getImageStyle_AntiAlias(), ecorePackage.getEBooleanObject(), "antiAlias", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				ImageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getImageStyle_MaintainAspectRatio(), ecorePackage.getEBooleanObject(), "maintainAspectRatio", //$NON-NLS-1$
+				"true", 0, 1, ImageStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, //$NON-NLS-1$
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEReference(getImageStyle_CropBound(), this.getBounds(), null, "cropBound", null, 1, 1, ImageStyle.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(imageBufferStyleEClass, ImageBufferStyle.class, "ImageBufferStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+
+		initEReference(getImageBufferStyle_ImageBuffer(), this.getImage(), null, "imageBuffer", null, 1, 1, //$NON-NLS-1$
+				ImageBufferStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(propertiesSetStyleEClass, PropertiesSetStyle.class, "PropertiesSetStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEReference(getPropertiesSetStyle_PropertiesMap(), this.getStringToPropertyValueMapEntry(), null,
+				"propertiesMap", null, 0, -1, PropertiesSetStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+				IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		op = addEOperation(propertiesSetStyleEClass, theEcorePackage.getEJavaObject(), "getProperty", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEString(), "propertyName", 0, 1); //$NON-NLS-1$
@@ -3107,36 +3249,55 @@
 		addEParameter(op, theEcorePackage.getEString(), "propertyName", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEString(), "initialValue", 0, 1); //$NON-NLS-1$
 
-		initEClass(stringToPropertyValueMapEntryEClass, Map.Entry.class, "StringToPropertyValueMapEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getStringToPropertyValueMapEntry_Key(), theEcorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getStringToPropertyValueMapEntry_Value(), this.getPropertyValue(), null, "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(stringToPropertyValueMapEntryEClass, Map.Entry.class, "StringToPropertyValueMapEntry", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getStringToPropertyValueMapEntry_Key(), theEcorePackage.getEString(), "key", null, 0, 1, //$NON-NLS-1$
+				Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(propertyValueEClass, PropertyValue.class, "PropertyValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getPropertyValue_RawValue(), ecorePackage.getEString(), "rawValue", null, 0, 1, PropertyValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		  
-		initEReference(getPropertyValue_InstanceType(), theEcorePackage.getEDataType(), null, "instanceType", null, 0, 1, PropertyValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getStringToPropertyValueMapEntry_Value(), this.getPropertyValue(), null, "value", null, 0, 1, //$NON-NLS-1$
+				Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(propertyValueEClass, PropertyValue.class, "PropertyValue", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPropertyValue_RawValue(), ecorePackage.getEString(), "rawValue", null, 0, 1, //$NON-NLS-1$
+				PropertyValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEReference(getPropertyValue_InstanceType(), theEcorePackage.getEDataType(), null, "instanceType", null, 0, //$NON-NLS-1$
+				1, PropertyValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		addEOperation(propertyValueEClass, theEcorePackage.getEJavaObject(), "getValue", 0, 1); //$NON-NLS-1$
 
 		op = addEOperation(propertyValueEClass, null, "setValue"); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEJavaObject(), "newValue", 0, 1); //$NON-NLS-1$
 
-		initEClass(singleValueStyleEClass, SingleValueStyle.class, "SingleValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getSingleValueStyle_RawValue(), ecorePackage.getEString(), "rawValue", null, 0, 1, SingleValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(singleValueStyleEClass, SingleValueStyle.class, "SingleValueStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getSingleValueStyle_RawValue(), ecorePackage.getEString(), "rawValue", null, 0, 1, //$NON-NLS-1$
+				SingleValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
 		addEOperation(singleValueStyleEClass, theEcorePackage.getEJavaObject(), "getValue", 0, 1); //$NON-NLS-1$
 
 		op = addEOperation(singleValueStyleEClass, null, "setValue"); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEJavaObject(), "newValue", 0, 1); //$NON-NLS-1$
 
-		initEClass(listValueStyleEClass, ListValueStyle.class, "ListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getListValueStyle_RawValuesList(), theEcorePackage.getEString(), "rawValuesList", null, 0, -1, ListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(listValueStyleEClass, ListValueStyle.class, "ListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getListValueStyle_RawValuesList(), theEcorePackage.getEString(), "rawValuesList", null, 0, -1, //$NON-NLS-1$
+				ListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(namedStyleEClass, NamedStyle.class, "NamedStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getNamedStyle_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(namedStyleEClass, NamedStyle.class, "NamedStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getNamedStyle_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedStyle.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(stringObjectConverterEClass, StringObjectConverter.class, "StringObjectConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(stringObjectConverterEClass, StringObjectConverter.class, "StringObjectConverter", IS_ABSTRACT, //$NON-NLS-1$
+				IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		op = addEOperation(stringObjectConverterEClass, theEcorePackage.getEString(), "getStringFromObject", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEJavaObject(), "objectValue", 0, 1); //$NON-NLS-1$
@@ -3144,88 +3305,153 @@
 		op = addEOperation(stringObjectConverterEClass, theEcorePackage.getEJavaObject(), "getObjectFromString", 0, 1); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEString(), "stringValue", 0, 1); //$NON-NLS-1$
 
-		initEClass(dataTypeStyleEClass, DataTypeStyle.class, "DataTypeStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getDataTypeStyle_InstanceType(), theEcorePackage.getEDataType(), null, "instanceType", null, 0, 1, DataTypeStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(dataTypeStyleEClass, DataTypeStyle.class, "DataTypeStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(intValueStyleEClass, IntValueStyle.class, "IntValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getIntValueStyle_IntValue(), theEcorePackage.getEInt(), "intValue", null, 0, 1, IntValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getDataTypeStyle_InstanceType(), theEcorePackage.getEDataType(), null, "instanceType", null, 0, //$NON-NLS-1$
+				1, DataTypeStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(intListValueStyleEClass, IntListValueStyle.class, "IntListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getIntListValueStyle_IntListValue(), theEcorePackage.getEInt(), "intListValue", null, 0, -1, IntListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(intValueStyleEClass, IntValueStyle.class, "IntValueStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIntValueStyle_IntValue(), theEcorePackage.getEInt(), "intValue", null, 0, 1, //$NON-NLS-1$
+				IntValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(booleanValueStyleEClass, BooleanValueStyle.class, "BooleanValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getBooleanValueStyle_BooleanValue(), theEcorePackage.getEBoolean(), "booleanValue", null, 0, 1, BooleanValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(intListValueStyleEClass, IntListValueStyle.class, "IntListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIntListValueStyle_IntListValue(), theEcorePackage.getEInt(), "intListValue", null, 0, -1, //$NON-NLS-1$
+				IntListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(doubleValueStyleEClass, DoubleValueStyle.class, "DoubleValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDoubleValueStyle_DoubleValue(), theEcorePackage.getEDouble(), "doubleValue", null, 0, 1, DoubleValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(booleanValueStyleEClass, BooleanValueStyle.class, "BooleanValueStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getBooleanValueStyle_BooleanValue(), theEcorePackage.getEBoolean(), "booleanValue", null, 0, 1, //$NON-NLS-1$
+				BooleanValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(doubleListValueStyleEClass, DoubleListValueStyle.class, "DoubleListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDoubleListValueStyle_DoubleListValue(), theEcorePackage.getEDoubleObject(), "doubleListValue", null, 0, -1, DoubleListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(doubleValueStyleEClass, DoubleValueStyle.class, "DoubleValueStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDoubleValueStyle_DoubleValue(), theEcorePackage.getEDouble(), "doubleValue", null, 0, 1, //$NON-NLS-1$
+				DoubleValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(stringValueStyleEClass, StringValueStyle.class, "StringValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getStringValueStyle_StringValue(), theEcorePackage.getEString(), "stringValue", null, 0, 1, StringValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(doubleListValueStyleEClass, DoubleListValueStyle.class, "DoubleListValueStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDoubleListValueStyle_DoubleListValue(), theEcorePackage.getEDoubleObject(), "doubleListValue", //$NON-NLS-1$
+				null, 0, -1, DoubleListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+				!IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(stringListValueStyleEClass, StringListValueStyle.class, "StringListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getStringListValueStyle_StringListValue(), theEcorePackage.getEString(), "stringListValue", null, 0, -1, StringListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(stringValueStyleEClass, StringValueStyle.class, "StringValueStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getStringValueStyle_StringValue(), theEcorePackage.getEString(), "stringValue", null, 0, 1, //$NON-NLS-1$
+				StringValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
-		initEClass(eObjectValueStyleEClass, EObjectValueStyle.class, "EObjectValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getEObjectValueStyle_EObjectValue(), theEcorePackage.getEObject(), null, "eObjectValue", null, 0, 1, EObjectValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(stringListValueStyleEClass, StringListValueStyle.class, "StringListValueStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getStringListValueStyle_StringListValue(), theEcorePackage.getEString(), "stringListValue", null, //$NON-NLS-1$
+				0, -1, StringListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				!IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(eObjectListValueStyleEClass, EObjectListValueStyle.class, "EObjectListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getEObjectListValueStyle_EObjectListValue(), theEcorePackage.getEObject(), null, "eObjectListValue", null, 0, -1, EObjectListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(eObjectValueStyleEClass, EObjectValueStyle.class, "EObjectValueStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(byteArrayValueStyleEClass, ByteArrayValueStyle.class, "ByteArrayValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getByteArrayValueStyle_ByteArrayValue(), theEcorePackage.getEByteArray(), "byteArrayValue", null, 0, 1, ByteArrayValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getEObjectValueStyle_EObjectValue(), theEcorePackage.getEObject(), null, "eObjectValue", null, 0, //$NON-NLS-1$
+				1, EObjectValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(booleanListValueStyleEClass, BooleanListValueStyle.class, "BooleanListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getBooleanListValueStyle_BooleanListValue(), theEcorePackage.getEBooleanObject(), "booleanListValue", null, 0, -1, BooleanListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(eObjectListValueStyleEClass, EObjectListValueStyle.class, "EObjectListValueStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(hintedDiagramLinkStyleEClass, HintedDiagramLinkStyle.class, "HintedDiagramLinkStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getHintedDiagramLinkStyle_Hint(), theEcorePackage.getEString(), "hint", null, 0, 1, HintedDiagramLinkStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getEObjectListValueStyle_EObjectListValue(), theEcorePackage.getEObject(), null,
+				"eObjectListValue", null, 0, -1, EObjectListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(diagramLinkStyleEClass, DiagramLinkStyle.class, "DiagramLinkStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getDiagramLinkStyle_DiagramLink(), this.getDiagram(), null, "diagramLink", null, 0, 1, DiagramLinkStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(byteArrayValueStyleEClass, ByteArrayValueStyle.class, "ByteArrayValueStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getByteArrayValueStyle_ByteArrayValue(), theEcorePackage.getEByteArray(), "byteArrayValue", null, //$NON-NLS-1$
+				0, 1, ByteArrayValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(multiDiagramLinkStyleEClass, MultiDiagramLinkStyle.class, "MultiDiagramLinkStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		  
-		initEReference(getMultiDiagramLinkStyle_DiagramLinks(), this.getDiagram(), null, "diagramLinks", null, 0, -1, MultiDiagramLinkStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(booleanListValueStyleEClass, BooleanListValueStyle.class, "BooleanListValueStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getBooleanListValueStyle_BooleanListValue(), theEcorePackage.getEBooleanObject(),
+				"booleanListValue", null, 0, -1, BooleanListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(textStyleEClass, TextStyle.class, "TextStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getTextStyle_TextAlignment(), this.getTextAlignment(), "textAlignment", "Left", 0, 1, TextStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(hintedDiagramLinkStyleEClass, HintedDiagramLinkStyle.class, "HintedDiagramLinkStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getHintedDiagramLinkStyle_Hint(), theEcorePackage.getEString(), "hint", null, 0, 1, //$NON-NLS-1$
+				HintedDiagramLinkStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(lineTypeStyleEClass, LineTypeStyle.class, "LineTypeStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getLineTypeStyle_LineType(), this.getLineType(), "lineType", "Solid", 0, 1, LineTypeStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(diagramLinkStyleEClass, DiagramLinkStyle.class, "DiagramLinkStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(arrowStyleEClass, ArrowStyle.class, "ArrowStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getArrowStyle_ArrowSource(), this.getArrowType(), "arrowSource", "None", 0, 1, ArrowStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getArrowStyle_ArrowTarget(), this.getArrowType(), "arrowTarget", "None", 0, 1, ArrowStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getDiagramLinkStyle_DiagramLink(), this.getDiagram(), null, "diagramLink", null, 0, 1, //$NON-NLS-1$
+				DiagramLinkStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(multiDiagramLinkStyleEClass, MultiDiagramLinkStyle.class, "MultiDiagramLinkStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEReference(getMultiDiagramLinkStyle_DiagramLinks(), this.getDiagram(), null, "diagramLinks", null, 0, -1, //$NON-NLS-1$
+				MultiDiagramLinkStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(textStyleEClass, TextStyle.class, "TextStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTextStyle_TextAlignment(), this.getTextAlignment(), "textAlignment", "Left", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+				TextStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(lineTypeStyleEClass, LineTypeStyle.class, "LineTypeStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getLineTypeStyle_LineType(), this.getLineType(), "lineType", "Solid", 0, 1, LineTypeStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(arrowStyleEClass, ArrowStyle.class, "ArrowStyle", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getArrowStyle_ArrowSource(), this.getArrowType(), "arrowSource", "None", 0, 1, ArrowStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getArrowStyle_ArrowTarget(), this.getArrowType(), "arrowTarget", "None", 0, 1, ArrowStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(shapeEClass, Shape.class, "Shape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(compartmentEClass, Compartment.class, "Compartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(compartmentEClass, Compartment.class, "Compartment", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(listCompartmentEClass, ListCompartment.class, "ListCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(listCompartmentEClass, ListCompartment.class, "ListCompartment", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(standardDiagramEClass, StandardDiagram.class, "StandardDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(standardDiagramEClass, StandardDiagram.class, "StandardDiagram", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(decorationNodeEClass, DecorationNode.class, "DecorationNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(decorationNodeEClass, DecorationNode.class, "DecorationNode", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(basicDecorationNodeEClass, BasicDecorationNode.class, "BasicDecorationNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(basicDecorationNodeEClass, BasicDecorationNode.class, "BasicDecorationNode", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(basicCompartmentEClass, BasicCompartment.class, "BasicCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(basicCompartmentEClass, BasicCompartment.class, "BasicCompartment", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(basicSemanticCompartmentEClass, BasicSemanticCompartment.class, "BasicSemanticCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(basicSemanticCompartmentEClass, BasicSemanticCompartment.class, "BasicSemanticCompartment", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(semanticListCompartmentEClass, SemanticListCompartment.class, "SemanticListCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(semanticListCompartmentEClass, SemanticListCompartment.class, "SemanticListCompartment", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(roundedCornersStyleEClass, RoundedCornersStyle.class, "RoundedCornersStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getRoundedCornersStyle_RoundedBendpointsRadius(), ecorePackage.getEInt(), "roundedBendpointsRadius", "0", 0, 1, RoundedCornersStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(roundedCornersStyleEClass, RoundedCornersStyle.class, "RoundedCornersStyle", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRoundedCornersStyle_RoundedBendpointsRadius(), ecorePackage.getEInt(),
+				"roundedBendpointsRadius", "0", 0, 1, RoundedCornersStyle.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Initialize enums and add enum literals
 		initEEnum(sortingEEnum, Sorting.class, "Sorting"); //$NON-NLS-1$
@@ -3298,33 +3524,31 @@
 		addEEnumLiteral(gradientStyleEEnum, GradientStyle.HORIZONTAL_LITERAL);
 
 		// Initialize data types
-		initEDataType(relativeBendpointListEDataType, List.class, "RelativeBendpointList", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(filterKeyListEDataType, List.class, "FilterKeyList", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(relativeBendpointListEDataType, List.class, "RelativeBendpointList", IS_SERIALIZABLE, //$NON-NLS-1$
+				!IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(filterKeyListEDataType, List.class, "FilterKeyList", IS_SERIALIZABLE, //$NON-NLS-1$
+				!IS_GENERATED_INSTANCE_CLASS);
 		initEDataType(sortKeyMapEDataType, Map.class, "SortKeyMap", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(gradientDataEDataType, GradientData.class, "GradientData", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(gradientDataEDataType, GradientData.class, "GradientData", IS_SERIALIZABLE, //$NON-NLS-1$
+				!IS_GENERATED_INSTANCE_CLASS);
 
 		// Create resource
 		createResource(eNS_URI);
 	}
-	
-	void createAnnotations()
-	{
+
+	void createAnnotations() {
 		for (Iterator it = getEClassifiers().iterator(); it.hasNext();) {
 			EClassifier eClassifier = (EClassifier) it.next();
-	    String name = eClassifier.getName();
-        if (name.equals("Node") || name.indexOf("Style") != -1 || name.equals("Location") || name.equals("Size") ||  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$  //$NON-NLS-4$
-             name.indexOf("Anchor") != -1 || name.indexOf("point") != -1 || name.equals("Bounds") || name.indexOf("Edge") != -1 || name.indexOf("Constraint") != -1) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        {
-  	      String source = "foo"; //$NON-NLS-1$  
-  	      addAnnotation
-  	        (eClassifier, 
-  	         source, 
-  	         new String[] 
-  	         {
-  	         "uuid", "false" //$NON-NLS-1$ //$NON-NLS-2$ 
-  	         });  
-        }
-	  }
+			String name = eClassifier.getName();
+			if (name.equals("Node") || name.indexOf("Style") != -1 || name.equals("Location") || name.equals("Size") || //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+					name.indexOf("Anchor") != -1 || name.indexOf("point") != -1 || name.equals("Bounds") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+					|| name.indexOf("Edge") != -1 || name.indexOf("Constraint") != -1) //$NON-NLS-1$ //$NON-NLS-2$
+			{
+				String source = "foo"; //$NON-NLS-1$
+				addAnnotation(eClassifier, source, new String[] { "uuid", "false" //$NON-NLS-1$ //$NON-NLS-2$
+				});
+			}
+		}
 	}
 
-} //NotationPackageImpl
+} // NotationPackageImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PageStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PageStyleImpl.java
index f4ce7c5..6787e2f 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PageStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PageStyleImpl.java
@@ -20,18 +20,21 @@
 import org.eclipse.gmf.runtime.notation.PageStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Page Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Page
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl#getPageX <em>Page X</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl#getPageY <em>Page Y</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl#getPageWidth <em>Page Width</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl#getPageHeight <em>Page Height</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl#getPageX
+ * <em>Page X</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl#getPageY
+ * <em>Page Y</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl#getPageWidth
+ * <em>Page Width</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.PageStyleImpl#getPageHeight
+ * <em>Page Height</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -39,116 +42,116 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class PageStyleImpl extends MinimalEObjectImpl.Container implements PageStyle {
-    /**
+	/**
 	 * The default value of the '{@link #getPageX() <em>Page X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageX()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int PAGE_X_EDEFAULT = 0;
 
-    /**
-	 * The cached value of the '{@link #getPageX() <em>Page X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getPageX() <em>Page X</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageX()
 	 * @generated
 	 * @ordered
 	 */
 	protected int pageX = PAGE_X_EDEFAULT;
 
-    /**
+	/**
 	 * The default value of the '{@link #getPageY() <em>Page Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageY()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int PAGE_Y_EDEFAULT = 0;
 
-    /**
-	 * The cached value of the '{@link #getPageY() <em>Page Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getPageY() <em>Page Y</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageY()
 	 * @generated
 	 * @ordered
 	 */
 	protected int pageY = PAGE_Y_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getPageWidth() <em>Page Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getPageWidth() <em>Page Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int PAGE_WIDTH_EDEFAULT = 100;
 
-    /**
-	 * The cached value of the '{@link #getPageWidth() <em>Page Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getPageWidth() <em>Page Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected int pageWidth = PAGE_WIDTH_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getPageHeight() <em>Page Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getPageHeight() <em>Page Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int PAGE_HEIGHT_EDEFAULT = 100;
 
-    /**
-	 * The cached value of the '{@link #getPageHeight() <em>Page Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getPageHeight() <em>Page Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected int pageHeight = PAGE_HEIGHT_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PageStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.PAGE_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPageX() {
 		return pageX;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPageX(int newPageX) {
@@ -158,18 +161,18 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PAGE_STYLE__PAGE_X, oldPageX, pageX));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPageY() {
 		return pageY;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPageY(int newPageY) {
@@ -179,139 +182,142 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PAGE_STYLE__PAGE_Y, oldPageY, pageY));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPageWidth() {
 		return pageWidth;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPageWidth(int newPageWidth) {
 		int oldPageWidth = pageWidth;
 		pageWidth = newPageWidth;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PAGE_STYLE__PAGE_WIDTH, oldPageWidth, pageWidth));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PAGE_STYLE__PAGE_WIDTH, oldPageWidth,
+					pageWidth));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPageHeight() {
 		return pageHeight;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPageHeight(int newPageHeight) {
 		int oldPageHeight = pageHeight;
 		pageHeight = newPageHeight;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PAGE_STYLE__PAGE_HEIGHT, oldPageHeight, pageHeight));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PAGE_STYLE__PAGE_HEIGHT,
+					oldPageHeight, pageHeight));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.PAGE_STYLE__PAGE_X:
-				return new Integer(getPageX());
-			case NotationPackage.PAGE_STYLE__PAGE_Y:
-				return new Integer(getPageY());
-			case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
-				return new Integer(getPageWidth());
-			case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
-				return new Integer(getPageHeight());
+		case NotationPackage.PAGE_STYLE__PAGE_X:
+			return new Integer(getPageX());
+		case NotationPackage.PAGE_STYLE__PAGE_Y:
+			return new Integer(getPageY());
+		case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
+			return new Integer(getPageWidth());
+		case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
+			return new Integer(getPageHeight());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.PAGE_STYLE__PAGE_X:
-				setPageX(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.PAGE_STYLE__PAGE_Y:
-				setPageY(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
-				setPageWidth(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
-				setPageHeight(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.PAGE_STYLE__PAGE_X:
+			setPageX(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.PAGE_STYLE__PAGE_Y:
+			setPageY(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
+			setPageWidth(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
+			setPageHeight(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.PAGE_STYLE__PAGE_X:
-				setPageX(PAGE_X_EDEFAULT);
-				return;
-			case NotationPackage.PAGE_STYLE__PAGE_Y:
-				setPageY(PAGE_Y_EDEFAULT);
-				return;
-			case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
-				setPageWidth(PAGE_WIDTH_EDEFAULT);
-				return;
-			case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
-				setPageHeight(PAGE_HEIGHT_EDEFAULT);
-				return;
+		case NotationPackage.PAGE_STYLE__PAGE_X:
+			setPageX(PAGE_X_EDEFAULT);
+			return;
+		case NotationPackage.PAGE_STYLE__PAGE_Y:
+			setPageY(PAGE_Y_EDEFAULT);
+			return;
+		case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
+			setPageWidth(PAGE_WIDTH_EDEFAULT);
+			return;
+		case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
+			setPageHeight(PAGE_HEIGHT_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.PAGE_STYLE__PAGE_X:
-				return pageX != PAGE_X_EDEFAULT;
-			case NotationPackage.PAGE_STYLE__PAGE_Y:
-				return pageY != PAGE_Y_EDEFAULT;
-			case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
-				return pageWidth != PAGE_WIDTH_EDEFAULT;
-			case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
-				return pageHeight != PAGE_HEIGHT_EDEFAULT;
+		case NotationPackage.PAGE_STYLE__PAGE_X:
+			return pageX != PAGE_X_EDEFAULT;
+		case NotationPackage.PAGE_STYLE__PAGE_Y:
+			return pageY != PAGE_Y_EDEFAULT;
+		case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
+			return pageWidth != PAGE_WIDTH_EDEFAULT;
+		case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
+			return pageHeight != PAGE_HEIGHT_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (pageX: "); //$NON-NLS-1$
@@ -326,4 +332,4 @@
 		return result.toString();
 	}
 
-} //PageStyleImpl
+} // PageStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PropertiesSetStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PropertiesSetStyleImpl.java
index 5f3d1ab..a5662a6 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PropertiesSetStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PropertiesSetStyleImpl.java
@@ -25,31 +25,32 @@
 import org.eclipse.gmf.runtime.notation.PropertyValue;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Properties Set Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Properties Set Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl#getPropertiesMap <em>Properties Map</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl#getPropertiesMap
+ * <em>Properties Map</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class PropertiesSetStyleImpl extends NamedStyleImpl implements PropertiesSetStyle {
 	/**
-	 * The cached value of the '{@link #getPropertiesMap() <em>Properties Map</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPropertiesMap() <em>Properties Map</em>}'
+	 * map. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPropertiesMap()
 	 * @generated
 	 * @ordered
 	 */
 	protected EMap propertiesMap;
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PropertiesSetStyleImpl() {
@@ -57,8 +58,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -66,24 +67,26 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EMap getPropertiesMap() {
 		if (propertiesMap == null) {
-			propertiesMap = new EcoreEMap(NotationPackage.Literals.STRING_TO_PROPERTY_VALUE_MAP_ENTRY, StringToPropertyValueMapEntryImpl.class, this, NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP);
+			propertiesMap = new EcoreEMap(NotationPackage.Literals.STRING_TO_PROPERTY_VALUE_MAP_ENTRY,
+					StringToPropertyValueMapEntryImpl.class, this,
+					NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP);
 		}
 		return propertiesMap;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public Object getProperty(String propertyName) {
-		PropertyValue propertyValue = (PropertyValue)getPropertiesMap().get(propertyName);
+		PropertyValue propertyValue = (PropertyValue) getPropertiesMap().get(propertyName);
 		if (propertyValue != null) {
 			return propertyValue.getValue();
 		}
@@ -91,12 +94,12 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean setProperty(String propertyName, Object newValue) {
-		PropertyValue propertyValue = (PropertyValue)getPropertiesMap().get(propertyName);
+		PropertyValue propertyValue = (PropertyValue) getPropertiesMap().get(propertyName);
 		if (propertyValue != null) {
 			propertyValue.setValue(newValue);
 			return true;
@@ -105,8 +108,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean createProperty(String propertyName, EDataType instanceType, Object initialValue) {
@@ -114,7 +117,7 @@
 			PropertyValue value = NotationFactory.eINSTANCE.createPropertyValue();
 			if (instanceType == null) {
 				if (initialValue instanceof String)
-					value.setRawValue((String)initialValue);
+					value.setRawValue((String) initialValue);
 				else
 					return false;
 			} else {
@@ -127,8 +130,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean removeProperty(String propertyName) {
@@ -136,8 +139,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean hasProperty(String propertyName) {
@@ -145,8 +148,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean createProperty(String propertyName, String initialValue) {
@@ -159,81 +162,83 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
-				return ((InternalEList)getPropertiesMap()).basicRemove(otherEnd, msgs);
+		case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
+			return ((InternalEList) getPropertiesMap()).basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.PROPERTIES_SET_STYLE__NAME:
-				return getName();
-			case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
-				if (coreType) return getPropertiesMap();
-				else return getPropertiesMap().map();
+		case NotationPackage.PROPERTIES_SET_STYLE__NAME:
+			return getName();
+		case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
+			if (coreType)
+				return getPropertiesMap();
+			else
+				return getPropertiesMap().map();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.PROPERTIES_SET_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
-				((EStructuralFeature.Setting)getPropertiesMap()).set(newValue);
-				return;
+		case NotationPackage.PROPERTIES_SET_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
+			((EStructuralFeature.Setting) getPropertiesMap()).set(newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.PROPERTIES_SET_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
-				getPropertiesMap().clear();
-				return;
+		case NotationPackage.PROPERTIES_SET_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
+			getPropertiesMap().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.PROPERTIES_SET_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
-				return propertiesMap != null && !propertiesMap.isEmpty();
+		case NotationPackage.PROPERTIES_SET_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.PROPERTIES_SET_STYLE__PROPERTIES_MAP:
+			return propertiesMap != null && !propertiesMap.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-} //PropertiesSetStyleImpl
+} // PropertiesSetStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PropertyValueImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PropertyValueImpl.java
index bf7d9e2..43d8023 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PropertyValueImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/PropertyValueImpl.java
@@ -22,24 +22,25 @@
 import org.eclipse.gmf.runtime.notation.PropertyValue;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property Value</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Property Value</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl#getRawValue <em>Raw Value</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl#getInstanceType <em>Instance Type</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl#getRawValue
+ * <em>Raw Value</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl#getInstanceType
+ * <em>Instance Type</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class PropertyValueImpl extends MinimalEObjectImpl.Container implements PropertyValue {
 	/**
-	 * The default value of the '{@link #getRawValue() <em>Raw Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRawValue() <em>Raw Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRawValue()
 	 * @generated
 	 * @ordered
@@ -47,9 +48,9 @@
 	protected static final String RAW_VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getRawValue() <em>Raw Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRawValue() <em>Raw Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRawValue()
 	 * @generated
 	 * @ordered
@@ -57,9 +58,9 @@
 	protected String rawValue = RAW_VALUE_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getInstanceType() <em>Instance Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getInstanceType() <em>Instance Type</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getInstanceType()
 	 * @generated
 	 * @ordered
@@ -67,8 +68,8 @@
 	protected EDataType instanceType;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PropertyValueImpl() {
@@ -76,8 +77,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -85,8 +86,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getRawValue() {
@@ -94,8 +95,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setRawValue(String newRawValue) {
@@ -112,37 +113,39 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRawValueGen(String newRawValue) {
 		String oldRawValue = rawValue;
 		rawValue = newRawValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PROPERTY_VALUE__RAW_VALUE, oldRawValue, rawValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PROPERTY_VALUE__RAW_VALUE,
+					oldRawValue, rawValue));
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getInstanceType() {
 		if (instanceType != null && instanceType.eIsProxy()) {
-			InternalEObject oldInstanceType = (InternalEObject)instanceType;
-			instanceType = (EDataType)eResolveProxy(oldInstanceType);
+			InternalEObject oldInstanceType = (InternalEObject) instanceType;
+			instanceType = (EDataType) eResolveProxy(oldInstanceType);
 			if (instanceType != oldInstanceType) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE, oldInstanceType, instanceType));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE, oldInstanceType, instanceType));
 			}
 		}
 		return instanceType;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType basicGetInstanceType() {
@@ -150,20 +153,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setInstanceType(EDataType newInstanceType) {
 		EDataType oldInstanceType = instanceType;
 		instanceType = newInstanceType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE, oldInstanceType, instanceType));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE,
+					oldInstanceType, instanceType));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public Object getValue() {
@@ -171,8 +175,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setValue(Object newValue) {
@@ -180,19 +184,19 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public String getStringFromObject(Object objectValue) {
 		if (getInstanceType() == null && objectValue instanceof String)
-			return (String)objectValue;
+			return (String) objectValue;
 		return EcoreUtil.convertToString(getInstanceType(), objectValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public Object getObjectFromString(String stringValue) {
@@ -202,77 +206,79 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.PROPERTY_VALUE__RAW_VALUE:
-				return getRawValue();
-			case NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE:
-				if (resolve) return getInstanceType();
-				return basicGetInstanceType();
+		case NotationPackage.PROPERTY_VALUE__RAW_VALUE:
+			return getRawValue();
+		case NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE:
+			if (resolve)
+				return getInstanceType();
+			return basicGetInstanceType();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.PROPERTY_VALUE__RAW_VALUE:
-				setRawValue((String)newValue);
-				return;
-			case NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE:
-				setInstanceType((EDataType)newValue);
-				return;
+		case NotationPackage.PROPERTY_VALUE__RAW_VALUE:
+			setRawValue((String) newValue);
+			return;
+		case NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE:
+			setInstanceType((EDataType) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.PROPERTY_VALUE__RAW_VALUE:
-				setRawValue(RAW_VALUE_EDEFAULT);
-				return;
-			case NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE:
-				setInstanceType((EDataType)null);
-				return;
+		case NotationPackage.PROPERTY_VALUE__RAW_VALUE:
+			setRawValue(RAW_VALUE_EDEFAULT);
+			return;
+		case NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE:
+			setInstanceType((EDataType) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.PROPERTY_VALUE__RAW_VALUE:
-				return RAW_VALUE_EDEFAULT == null ? rawValue != null : !RAW_VALUE_EDEFAULT.equals(rawValue);
-			case NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE:
-				return instanceType != null;
+		case NotationPackage.PROPERTY_VALUE__RAW_VALUE:
+			return RAW_VALUE_EDEFAULT == null ? rawValue != null : !RAW_VALUE_EDEFAULT.equals(rawValue);
+		case NotationPackage.PROPERTY_VALUE__INSTANCE_TYPE:
+			return instanceType != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (rawValue: "); //$NON-NLS-1$
@@ -281,4 +287,4 @@
 		return result.toString();
 	}
 
-} //PropertyValueImpl
+} // PropertyValueImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RatioImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RatioImpl.java
index 162ab8f..fe774e2 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RatioImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RatioImpl.java
@@ -20,15 +20,15 @@
 import org.eclipse.gmf.runtime.notation.Ratio;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ratio</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Ratio</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RatioImpl#getValue <em>Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RatioImpl#getValue
+ * <em>Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -36,56 +36,56 @@
  * @canBeSeenBy %partners
  */
 public class RatioImpl extends MinimalEObjectImpl.Container implements Ratio {
-    /**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final double VALUE_EDEFAULT = -1.0;
 
-    /**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
 	 */
 	protected double value = VALUE_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RatioImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.RATIO;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getValue() {
 		return value;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(double newValue) {
@@ -95,67 +95,68 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.RATIO__VALUE, oldValue, value));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.RATIO__VALUE:
-				return new Double(getValue());
+		case NotationPackage.RATIO__VALUE:
+			return new Double(getValue());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.RATIO__VALUE:
-				setValue(((Double)newValue).doubleValue());
-				return;
+		case NotationPackage.RATIO__VALUE:
+			setValue(((Double) newValue).doubleValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.RATIO__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
+		case NotationPackage.RATIO__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.RATIO__VALUE:
-				return value != VALUE_EDEFAULT;
+		case NotationPackage.RATIO__VALUE:
+			return value != VALUE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: "); //$NON-NLS-1$
@@ -164,4 +165,4 @@
 		return result.toString();
 	}
 
-} //RatioImpl
+} // RatioImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RelativeBendpointsImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RelativeBendpointsImpl.java
index 26400ba..6a0b872 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RelativeBendpointsImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RelativeBendpointsImpl.java
@@ -26,15 +26,15 @@
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Relative Bendpoints</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Relative Bendpoints</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl#getPoints <em>Points</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl#getPoints
+ * <em>Points</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -44,36 +44,36 @@
 public class RelativeBendpointsImpl extends MinimalEObjectImpl.Container implements RelativeBendpoints {
 	/**
 	 * The default value of the '{@link #getPoints() <em>Points</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoints()
 	 * @generated NOT
 	 * @ordered
 	 */
 	protected static final List POINTS_EDEFAULT = Collections.EMPTY_LIST;
 
-    /**
+	/**
 	 * The cached value of the '{@link #getPoints() <em>Points</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoints()
 	 * @generated
 	 * @ordered
 	 */
 	protected List points = POINTS_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RelativeBendpointsImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -81,8 +81,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public List getPoints() {
@@ -90,21 +90,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List getPointsGen() {
 		return points;
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setPoints(List newPoints) {
-		if (newPoints == null )
+		if (newPoints == null)
 			throw new NullPointerException("the 'newPoints' parameter is null"); //$NON-NLS-1$
 
 		if (newPoints.isEmpty())
@@ -114,7 +114,8 @@
 			for (Iterator i = newPoints.iterator(); i.hasNext();) {
 				Object point = i.next();
 				if (!(point instanceof RelativeBendpoint))
-					throw new IllegalArgumentException("One or more objects in the list is not of type org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"); //$NON-NLS-1$
+					throw new IllegalArgumentException(
+							"One or more objects in the list is not of type org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"); //$NON-NLS-1$
 				tempList.add(point);
 			}
 			setPointsGen(tempList);
@@ -122,78 +123,80 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPointsGen(List newPoints) {
 		List oldPoints = points;
 		points = newPoints;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.RELATIVE_BENDPOINTS__POINTS, Collections.unmodifiableList(oldPoints), Collections.unmodifiableList(points)));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.RELATIVE_BENDPOINTS__POINTS,
+					oldPoints, points));
 	}
-	
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.RELATIVE_BENDPOINTS__POINTS:
-				return getPoints();
+		case NotationPackage.RELATIVE_BENDPOINTS__POINTS:
+			return getPoints();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.RELATIVE_BENDPOINTS__POINTS:
-				setPoints((List)newValue);
-				return;
+		case NotationPackage.RELATIVE_BENDPOINTS__POINTS:
+			setPoints((List) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.RELATIVE_BENDPOINTS__POINTS:
-				setPoints(POINTS_EDEFAULT);
-				return;
+		case NotationPackage.RELATIVE_BENDPOINTS__POINTS:
+			setPoints(POINTS_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.RELATIVE_BENDPOINTS__POINTS:
-				return POINTS_EDEFAULT == null ? points != null : !POINTS_EDEFAULT.equals(points);
+		case NotationPackage.RELATIVE_BENDPOINTS__POINTS:
+			return POINTS_EDEFAULT == null ? points != null : !POINTS_EDEFAULT.equals(points);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (points: "); //$NON-NLS-1$
@@ -202,4 +205,4 @@
 		return result.toString();
 	}
 
-} //RelativeBendpointsImpl
+} // RelativeBendpointsImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RoundedCornersStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RoundedCornersStyleImpl.java
index 44c2dbd..e7d1ceb 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RoundedCornersStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RoundedCornersStyleImpl.java
@@ -12,34 +12,32 @@
 package org.eclipse.gmf.runtime.notation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rounded Corners Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Rounded
+ * Corners Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl#getRoundedBendpointsRadius <em>Rounded Bendpoints Radius</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl#getRoundedBendpointsRadius
+ * <em>Rounded Bendpoints Radius</em>}</li>
+ * </ul>
  *
  * @generated
  * @since 1.4
  */
 public class RoundedCornersStyleImpl extends MinimalEObjectImpl.Container implements RoundedCornersStyle {
 	/**
-	 * The default value of the '{@link #getRoundedBendpointsRadius() <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRoundedBendpointsRadius() <em>Rounded
+	 * Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 * @ordered
@@ -47,9 +45,10 @@
 	protected static final int ROUNDED_BENDPOINTS_RADIUS_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getRoundedBendpointsRadius() <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRoundedBendpointsRadius() <em>Rounded
+	 * Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 * @ordered
@@ -57,8 +56,8 @@
 	protected int roundedBendpointsRadius = ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RoundedCornersStyleImpl() {
@@ -66,8 +65,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -75,8 +74,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getRoundedBendpointsRadius() {
@@ -84,78 +83,81 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRoundedBendpointsRadius(int newRoundedBendpointsRadius) {
 		int oldRoundedBendpointsRadius = roundedBendpointsRadius;
 		roundedBendpointsRadius = newRoundedBendpointsRadius;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS, oldRoundedBendpointsRadius, roundedBendpointsRadius));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS, oldRoundedBendpointsRadius,
+					roundedBendpointsRadius));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				return new Integer(getRoundedBendpointsRadius());
+		case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			return new Integer(getRoundedBendpointsRadius());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
-				return;
+		case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
+		case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (roundedBendpointsRadius: "); //$NON-NLS-1$
@@ -164,4 +166,4 @@
 		return result.toString();
 	}
 
-} //RoundedCornersStyleImpl
+} // RoundedCornersStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RoutingStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RoutingStyleImpl.java
index 3268e46..a0c9c8a 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RoutingStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/RoutingStyleImpl.java
@@ -23,21 +23,27 @@
 import org.eclipse.gmf.runtime.notation.Smoothness;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Routing Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Routing
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#getRouting <em>Routing</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#getSmoothness <em>Smoothness</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#isAvoidObstructions <em>Avoid Obstructions</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#isClosestDistance <em>Closest Distance</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#getJumpLinkStatus <em>Jump Link Status</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#getJumpLinkType <em>Jump Link Type</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#isJumpLinksReverse <em>Jump Links Reverse</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#getRouting
+ * <em>Routing</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#getSmoothness
+ * <em>Smoothness</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#isAvoidObstructions
+ * <em>Avoid Obstructions</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#isClosestDistance
+ * <em>Closest Distance</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#getJumpLinkStatus
+ * <em>Jump Link Status</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#getJumpLinkType
+ * <em>Jump Link Type</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl#isJumpLinksReverse
+ * <em>Jump Links Reverse</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -45,561 +51,603 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class RoutingStyleImpl extends RoundedCornersStyleImpl implements RoutingStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
-    /**
+
+	/**
 	 * The default value of the '{@link #getRouting() <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRouting()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final Routing ROUTING_EDEFAULT = Routing.MANUAL_LITERAL;
 
-    /**
-	 * The offset of the flags representing the value of the '{@link #getRouting() <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The offset of the flags representing the value of the '{@link #getRouting()
+	 * <em>Routing</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ROUTING_EFLAG_OFFSET = 8;
 
-				/**
-	 * The flags representing the default value of the '{@link #getRouting() <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the default value of the '{@link #getRouting()
+	 * <em>Routing</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ROUTING_EFLAG_DEFAULT = Routing.VALUES.indexOf(ROUTING_EDEFAULT) << ROUTING_EFLAG_OFFSET;
 
-				/**
-	 * The array of enumeration values for '{@link Routing Routing}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The array of enumeration values for '{@link Routing Routing}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Routing[] ROUTING_EFLAG_VALUES = (Routing[])Routing.VALUES.toArray(new Routing[Routing.VALUES.size()]);
+	private static final Routing[] ROUTING_EFLAG_VALUES = (Routing[]) Routing.VALUES
+			.toArray(new Routing[Routing.VALUES.size()]);
 
-				/**
-	 * The flags representing the value of the '{@link #getRouting() <em>Routing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the value of the '{@link #getRouting()
+	 * <em>Routing</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRouting()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ROUTING_EFLAG = 0x3 << ROUTING_EFLAG_OFFSET;
 
-				/**
-	 * The default value of the '{@link #getSmoothness() <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getSmoothness() <em>Smoothness</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSmoothness()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final Smoothness SMOOTHNESS_EDEFAULT = Smoothness.NONE_LITERAL;
 
-    /**
-	 * The offset of the flags representing the value of the '{@link #getSmoothness() <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The offset of the flags representing the value of the
+	 * '{@link #getSmoothness() <em>Smoothness</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SMOOTHNESS_EFLAG_OFFSET = 10;
 
-				/**
-	 * The flags representing the default value of the '{@link #getSmoothness() <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the default value of the '{@link #getSmoothness()
+	 * <em>Smoothness</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int SMOOTHNESS_EFLAG_DEFAULT = Smoothness.VALUES.indexOf(SMOOTHNESS_EDEFAULT) << SMOOTHNESS_EFLAG_OFFSET;
+	protected static final int SMOOTHNESS_EFLAG_DEFAULT = Smoothness.VALUES
+			.indexOf(SMOOTHNESS_EDEFAULT) << SMOOTHNESS_EFLAG_OFFSET;
 
-				/**
-	 * The array of enumeration values for '{@link Smoothness Smoothness}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The array of enumeration values for '{@link Smoothness Smoothness}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Smoothness[] SMOOTHNESS_EFLAG_VALUES = (Smoothness[])Smoothness.VALUES.toArray(new Smoothness[Smoothness.VALUES.size()]);
+	private static final Smoothness[] SMOOTHNESS_EFLAG_VALUES = (Smoothness[]) Smoothness.VALUES
+			.toArray(new Smoothness[Smoothness.VALUES.size()]);
 
-				/**
-	 * The flags representing the value of the '{@link #getSmoothness() <em>Smoothness</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the value of the '{@link #getSmoothness()
+	 * <em>Smoothness</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getSmoothness()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SMOOTHNESS_EFLAG = 0x3 << SMOOTHNESS_EFLAG_OFFSET;
 
-				/**
-	 * The default value of the '{@link #isAvoidObstructions() <em>Avoid Obstructions</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #isAvoidObstructions() <em>Avoid
+	 * Obstructions</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isAvoidObstructions()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean AVOID_OBSTRUCTIONS_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isAvoidObstructions() <em>Avoid Obstructions</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isAvoidObstructions()
+	 * <em>Avoid Obstructions</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isAvoidObstructions()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int AVOID_OBSTRUCTIONS_EFLAG = 1 << 12;
 
-    /**
-	 * The default value of the '{@link #isClosestDistance() <em>Closest Distance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #isClosestDistance() <em>Closest
+	 * Distance</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isClosestDistance()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean CLOSEST_DISTANCE_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isClosestDistance() <em>Closest Distance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isClosestDistance()
+	 * <em>Closest Distance</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isClosestDistance()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int CLOSEST_DISTANCE_EFLAG = 1 << 13;
 
-    /**
-	 * The default value of the '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getJumpLinkStatus() <em>Jump Link
+	 * Status</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJumpLinkStatus()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final JumpLinkStatus JUMP_LINK_STATUS_EDEFAULT = JumpLinkStatus.NONE_LITERAL;
 
-    /**
-	 * The offset of the flags representing the value of the '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The offset of the flags representing the value of the
+	 * '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int JUMP_LINK_STATUS_EFLAG_OFFSET = 14;
 
-				/**
-	 * The flags representing the default value of the '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the default value of the '{@link #getJumpLinkStatus()
+	 * <em>Jump Link Status</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int JUMP_LINK_STATUS_EFLAG_DEFAULT = JumpLinkStatus.VALUES.indexOf(JUMP_LINK_STATUS_EDEFAULT) << JUMP_LINK_STATUS_EFLAG_OFFSET;
+	protected static final int JUMP_LINK_STATUS_EFLAG_DEFAULT = JumpLinkStatus.VALUES
+			.indexOf(JUMP_LINK_STATUS_EDEFAULT) << JUMP_LINK_STATUS_EFLAG_OFFSET;
 
-				/**
+	/**
 	 * The array of enumeration values for '{@link JumpLinkStatus Jump Link Status}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final JumpLinkStatus[] JUMP_LINK_STATUS_EFLAG_VALUES = (JumpLinkStatus[])JumpLinkStatus.VALUES.toArray(new JumpLinkStatus[JumpLinkStatus.VALUES.size()]);
+	private static final JumpLinkStatus[] JUMP_LINK_STATUS_EFLAG_VALUES = (JumpLinkStatus[]) JumpLinkStatus.VALUES
+			.toArray(new JumpLinkStatus[JumpLinkStatus.VALUES.size()]);
 
-				/**
-	 * The flags representing the value of the '{@link #getJumpLinkStatus() <em>Jump Link Status</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the value of the '{@link #getJumpLinkStatus() <em>Jump
+	 * Link Status</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJumpLinkStatus()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int JUMP_LINK_STATUS_EFLAG = 0x3 << JUMP_LINK_STATUS_EFLAG_OFFSET;
 
-				/**
-	 * The default value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJumpLinkType()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final JumpLinkType JUMP_LINK_TYPE_EDEFAULT = JumpLinkType.SEMICIRCLE_LITERAL;
 
-    /**
-	 * The offset of the flags representing the value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The offset of the flags representing the value of the
+	 * '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int JUMP_LINK_TYPE_EFLAG_OFFSET = 16;
 
-				/**
-	 * The flags representing the default value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the default value of the '{@link #getJumpLinkType()
+	 * <em>Jump Link Type</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int JUMP_LINK_TYPE_EFLAG_DEFAULT = JumpLinkType.VALUES.indexOf(JUMP_LINK_TYPE_EDEFAULT) << JUMP_LINK_TYPE_EFLAG_OFFSET;
+	protected static final int JUMP_LINK_TYPE_EFLAG_DEFAULT = JumpLinkType.VALUES
+			.indexOf(JUMP_LINK_TYPE_EDEFAULT) << JUMP_LINK_TYPE_EFLAG_OFFSET;
 
-				/**
+	/**
 	 * The array of enumeration values for '{@link JumpLinkType Jump Link Type}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final JumpLinkType[] JUMP_LINK_TYPE_EFLAG_VALUES = (JumpLinkType[])JumpLinkType.VALUES.toArray(new JumpLinkType[JumpLinkType.VALUES.size()]);
+	private static final JumpLinkType[] JUMP_LINK_TYPE_EFLAG_VALUES = (JumpLinkType[]) JumpLinkType.VALUES
+			.toArray(new JumpLinkType[JumpLinkType.VALUES.size()]);
 
-				/**
-	 * The flags representing the value of the '{@link #getJumpLinkType() <em>Jump Link Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the value of the '{@link #getJumpLinkType() <em>Jump
+	 * Link Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJumpLinkType()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int JUMP_LINK_TYPE_EFLAG = 0x3 << JUMP_LINK_TYPE_EFLAG_OFFSET;
 
-				/**
-	 * The default value of the '{@link #isJumpLinksReverse() <em>Jump Links Reverse</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #isJumpLinksReverse() <em>Jump Links
+	 * Reverse</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isJumpLinksReverse()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean JUMP_LINKS_REVERSE_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isJumpLinksReverse() <em>Jump Links Reverse</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isJumpLinksReverse() <em>Jump
+	 * Links Reverse</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isJumpLinksReverse()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int JUMP_LINKS_REVERSE_EFLAG = 1 << 18;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RoutingStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.ROUTING_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Routing getRouting() {
 		return ROUTING_EFLAG_VALUES[(eFlags & ROUTING_EFLAG) >>> ROUTING_EFLAG_OFFSET];
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRouting(Routing newRouting) {
 		Routing oldRouting = ROUTING_EFLAG_VALUES[(eFlags & ROUTING_EFLAG) >>> ROUTING_EFLAG_OFFSET];
-		if (newRouting == null) newRouting = ROUTING_EDEFAULT;
+		if (newRouting == null)
+			newRouting = ROUTING_EDEFAULT;
 		eFlags = eFlags & ~ROUTING_EFLAG | Routing.VALUES.indexOf(newRouting) << ROUTING_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__ROUTING, oldRouting, newRouting));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__ROUTING, oldRouting,
+					newRouting));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Smoothness getSmoothness() {
 		return SMOOTHNESS_EFLAG_VALUES[(eFlags & SMOOTHNESS_EFLAG) >>> SMOOTHNESS_EFLAG_OFFSET];
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSmoothness(Smoothness newSmoothness) {
 		Smoothness oldSmoothness = SMOOTHNESS_EFLAG_VALUES[(eFlags & SMOOTHNESS_EFLAG) >>> SMOOTHNESS_EFLAG_OFFSET];
-		if (newSmoothness == null) newSmoothness = SMOOTHNESS_EDEFAULT;
+		if (newSmoothness == null)
+			newSmoothness = SMOOTHNESS_EDEFAULT;
 		eFlags = eFlags & ~SMOOTHNESS_EFLAG | Smoothness.VALUES.indexOf(newSmoothness) << SMOOTHNESS_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__SMOOTHNESS, oldSmoothness, newSmoothness));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__SMOOTHNESS,
+					oldSmoothness, newSmoothness));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isAvoidObstructions() {
 		return (eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAvoidObstructions(boolean newAvoidObstructions) {
 		boolean oldAvoidObstructions = (eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0;
-		if (newAvoidObstructions) eFlags |= AVOID_OBSTRUCTIONS_EFLAG; else eFlags &= ~AVOID_OBSTRUCTIONS_EFLAG;
+		if (newAvoidObstructions)
+			eFlags |= AVOID_OBSTRUCTIONS_EFLAG;
+		else
+			eFlags &= ~AVOID_OBSTRUCTIONS_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS, oldAvoidObstructions, newAvoidObstructions));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS,
+					oldAvoidObstructions, newAvoidObstructions));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isClosestDistance() {
 		return (eFlags & CLOSEST_DISTANCE_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClosestDistance(boolean newClosestDistance) {
 		boolean oldClosestDistance = (eFlags & CLOSEST_DISTANCE_EFLAG) != 0;
-		if (newClosestDistance) eFlags |= CLOSEST_DISTANCE_EFLAG; else eFlags &= ~CLOSEST_DISTANCE_EFLAG;
+		if (newClosestDistance)
+			eFlags |= CLOSEST_DISTANCE_EFLAG;
+		else
+			eFlags &= ~CLOSEST_DISTANCE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE, oldClosestDistance, newClosestDistance));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE,
+					oldClosestDistance, newClosestDistance));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public JumpLinkStatus getJumpLinkStatus() {
 		return JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags & JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET];
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJumpLinkStatus(JumpLinkStatus newJumpLinkStatus) {
-		JumpLinkStatus oldJumpLinkStatus = JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags & JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET];
-		if (newJumpLinkStatus == null) newJumpLinkStatus = JUMP_LINK_STATUS_EDEFAULT;
-		eFlags = eFlags & ~JUMP_LINK_STATUS_EFLAG | JumpLinkStatus.VALUES.indexOf(newJumpLinkStatus) << JUMP_LINK_STATUS_EFLAG_OFFSET;
+		JumpLinkStatus oldJumpLinkStatus = JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags
+				& JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET];
+		if (newJumpLinkStatus == null)
+			newJumpLinkStatus = JUMP_LINK_STATUS_EDEFAULT;
+		eFlags = eFlags & ~JUMP_LINK_STATUS_EFLAG
+				| JumpLinkStatus.VALUES.indexOf(newJumpLinkStatus) << JUMP_LINK_STATUS_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS, oldJumpLinkStatus, newJumpLinkStatus));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS,
+					oldJumpLinkStatus, newJumpLinkStatus));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public JumpLinkType getJumpLinkType() {
 		return JUMP_LINK_TYPE_EFLAG_VALUES[(eFlags & JUMP_LINK_TYPE_EFLAG) >>> JUMP_LINK_TYPE_EFLAG_OFFSET];
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJumpLinkType(JumpLinkType newJumpLinkType) {
-		JumpLinkType oldJumpLinkType = JUMP_LINK_TYPE_EFLAG_VALUES[(eFlags & JUMP_LINK_TYPE_EFLAG) >>> JUMP_LINK_TYPE_EFLAG_OFFSET];
-		if (newJumpLinkType == null) newJumpLinkType = JUMP_LINK_TYPE_EDEFAULT;
-		eFlags = eFlags & ~JUMP_LINK_TYPE_EFLAG | JumpLinkType.VALUES.indexOf(newJumpLinkType) << JUMP_LINK_TYPE_EFLAG_OFFSET;
+		JumpLinkType oldJumpLinkType = JUMP_LINK_TYPE_EFLAG_VALUES[(eFlags
+				& JUMP_LINK_TYPE_EFLAG) >>> JUMP_LINK_TYPE_EFLAG_OFFSET];
+		if (newJumpLinkType == null)
+			newJumpLinkType = JUMP_LINK_TYPE_EDEFAULT;
+		eFlags = eFlags & ~JUMP_LINK_TYPE_EFLAG
+				| JumpLinkType.VALUES.indexOf(newJumpLinkType) << JUMP_LINK_TYPE_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE, oldJumpLinkType, newJumpLinkType));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE,
+					oldJumpLinkType, newJumpLinkType));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isJumpLinksReverse() {
 		return (eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJumpLinksReverse(boolean newJumpLinksReverse) {
 		boolean oldJumpLinksReverse = (eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0;
-		if (newJumpLinksReverse) eFlags |= JUMP_LINKS_REVERSE_EFLAG; else eFlags &= ~JUMP_LINKS_REVERSE_EFLAG;
+		if (newJumpLinksReverse)
+			eFlags |= JUMP_LINKS_REVERSE_EFLAG;
+		else
+			eFlags &= ~JUMP_LINKS_REVERSE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE, oldJumpLinksReverse, newJumpLinksReverse));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE,
+					oldJumpLinksReverse, newJumpLinksReverse));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				return new Integer(getRoundedBendpointsRadius());
-			case NotationPackage.ROUTING_STYLE__ROUTING:
-				return getRouting();
-			case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
-				return getSmoothness();
-			case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
-				return isAvoidObstructions() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
-				return isClosestDistance() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
-				return getJumpLinkStatus();
-			case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
-				return getJumpLinkType();
-			case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
-				return isJumpLinksReverse() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			return new Integer(getRoundedBendpointsRadius());
+		case NotationPackage.ROUTING_STYLE__ROUTING:
+			return getRouting();
+		case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
+			return getSmoothness();
+		case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
+			return isAvoidObstructions() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
+			return isClosestDistance() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
+			return getJumpLinkStatus();
+		case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
+			return getJumpLinkType();
+		case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
+			return isJumpLinksReverse() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.ROUTING_STYLE__ROUTING:
-				setRouting((Routing)newValue);
-				return;
-			case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
-				setSmoothness((Smoothness)newValue);
-				return;
-			case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
-				setAvoidObstructions(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
-				setClosestDistance(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
-				setJumpLinkStatus((JumpLinkStatus)newValue);
-				return;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
-				setJumpLinkType((JumpLinkType)newValue);
-				return;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
-				setJumpLinksReverse(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.ROUTING_STYLE__ROUTING:
+			setRouting((Routing) newValue);
+			return;
+		case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
+			setSmoothness((Smoothness) newValue);
+			return;
+		case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
+			setAvoidObstructions(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
+			setClosestDistance(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
+			setJumpLinkStatus((JumpLinkStatus) newValue);
+			return;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
+			setJumpLinkType((JumpLinkType) newValue);
+			return;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
+			setJumpLinksReverse(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
-				return;
-			case NotationPackage.ROUTING_STYLE__ROUTING:
-				setRouting(ROUTING_EDEFAULT);
-				return;
-			case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
-				setSmoothness(SMOOTHNESS_EDEFAULT);
-				return;
-			case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
-				setAvoidObstructions(AVOID_OBSTRUCTIONS_EDEFAULT);
-				return;
-			case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
-				setClosestDistance(CLOSEST_DISTANCE_EDEFAULT);
-				return;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
-				setJumpLinkStatus(JUMP_LINK_STATUS_EDEFAULT);
-				return;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
-				setJumpLinkType(JUMP_LINK_TYPE_EDEFAULT);
-				return;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
-				setJumpLinksReverse(JUMP_LINKS_REVERSE_EDEFAULT);
-				return;
+		case NotationPackage.ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
+			return;
+		case NotationPackage.ROUTING_STYLE__ROUTING:
+			setRouting(ROUTING_EDEFAULT);
+			return;
+		case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
+			setSmoothness(SMOOTHNESS_EDEFAULT);
+			return;
+		case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
+			setAvoidObstructions(AVOID_OBSTRUCTIONS_EDEFAULT);
+			return;
+		case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
+			setClosestDistance(CLOSEST_DISTANCE_EDEFAULT);
+			return;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
+			setJumpLinkStatus(JUMP_LINK_STATUS_EDEFAULT);
+			return;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
+			setJumpLinkType(JUMP_LINK_TYPE_EDEFAULT);
+			return;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
+			setJumpLinksReverse(JUMP_LINKS_REVERSE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
-			case NotationPackage.ROUTING_STYLE__ROUTING:
-				return (eFlags & ROUTING_EFLAG) != ROUTING_EFLAG_DEFAULT;
-			case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
-				return (eFlags & SMOOTHNESS_EFLAG) != SMOOTHNESS_EFLAG_DEFAULT;
-			case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
-				return ((eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0) != AVOID_OBSTRUCTIONS_EDEFAULT;
-			case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
-				return ((eFlags & CLOSEST_DISTANCE_EFLAG) != 0) != CLOSEST_DISTANCE_EDEFAULT;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
-				return (eFlags & JUMP_LINK_STATUS_EFLAG) != JUMP_LINK_STATUS_EFLAG_DEFAULT;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
-				return (eFlags & JUMP_LINK_TYPE_EFLAG) != JUMP_LINK_TYPE_EFLAG_DEFAULT;
-			case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
-				return ((eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0) != JUMP_LINKS_REVERSE_EDEFAULT;
+		case NotationPackage.ROUTING_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
+		case NotationPackage.ROUTING_STYLE__ROUTING:
+			return (eFlags & ROUTING_EFLAG) != ROUTING_EFLAG_DEFAULT;
+		case NotationPackage.ROUTING_STYLE__SMOOTHNESS:
+			return (eFlags & SMOOTHNESS_EFLAG) != SMOOTHNESS_EFLAG_DEFAULT;
+		case NotationPackage.ROUTING_STYLE__AVOID_OBSTRUCTIONS:
+			return ((eFlags & AVOID_OBSTRUCTIONS_EFLAG) != 0) != AVOID_OBSTRUCTIONS_EDEFAULT;
+		case NotationPackage.ROUTING_STYLE__CLOSEST_DISTANCE:
+			return ((eFlags & CLOSEST_DISTANCE_EFLAG) != 0) != CLOSEST_DISTANCE_EDEFAULT;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINK_STATUS:
+			return (eFlags & JUMP_LINK_STATUS_EFLAG) != JUMP_LINK_STATUS_EFLAG_DEFAULT;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINK_TYPE:
+			return (eFlags & JUMP_LINK_TYPE_EFLAG) != JUMP_LINK_TYPE_EFLAG_DEFAULT;
+		case NotationPackage.ROUTING_STYLE__JUMP_LINKS_REVERSE:
+			return ((eFlags & JUMP_LINKS_REVERSE_EFLAG) != 0) != JUMP_LINKS_REVERSE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (routing: "); //$NON-NLS-1$
@@ -611,7 +659,8 @@
 		result.append(", closestDistance: "); //$NON-NLS-1$
 		result.append((eFlags & CLOSEST_DISTANCE_EFLAG) != 0);
 		result.append(", jumpLinkStatus: "); //$NON-NLS-1$
-		result.append(JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags & JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET]);
+		result.append(
+				JUMP_LINK_STATUS_EFLAG_VALUES[(eFlags & JUMP_LINK_STATUS_EFLAG) >>> JUMP_LINK_STATUS_EFLAG_OFFSET]);
 		result.append(", jumpLinkType: "); //$NON-NLS-1$
 		result.append(JUMP_LINK_TYPE_EFLAG_VALUES[(eFlags & JUMP_LINK_TYPE_EFLAG) >>> JUMP_LINK_TYPE_EFLAG_OFFSET]);
 		result.append(", jumpLinksReverse: "); //$NON-NLS-1$
@@ -620,4 +669,4 @@
 		return result.toString();
 	}
 
-} //RoutingStyleImpl
+} // RoutingStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SemanticListCompartmentImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SemanticListCompartmentImpl.java
index 91a690c..821b62d 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SemanticListCompartmentImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SemanticListCompartmentImpl.java
@@ -16,16 +16,11 @@
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.gmf.runtime.notation.Filtering;
 import org.eclipse.gmf.runtime.notation.FilteringStyle;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;
@@ -36,21 +31,27 @@
 import org.eclipse.gmf.runtime.notation.TitleStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Semantic List Compartment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Semantic List Compartment</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getSorting <em>Sorting</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getSortingKeys <em>Sorting Keys</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getSortedObjects <em>Sorted Objects</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getFiltering <em>Filtering</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getFilteringKeys <em>Filtering Keys</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getFilteredObjects <em>Filtered Objects</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#isShowTitle <em>Show Title</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getSorting
+ * <em>Sorting</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getSortingKeys
+ * <em>Sorting Keys</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getSortedObjects
+ * <em>Sorted Objects</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getFiltering
+ * <em>Filtering</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getFilteringKeys
+ * <em>Filtering Keys</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#getFilteredObjects
+ * <em>Filtered Objects</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl#isShowTitle
+ * <em>Show Title</em>}</li>
+ * </ul>
  *
  * @generated
  * @since 1.2
@@ -58,8 +59,8 @@
 public class SemanticListCompartmentImpl extends BasicSemanticCompartmentImpl implements SemanticListCompartment {
 	/**
 	 * The default value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSorting()
 	 * @generated
 	 * @ordered
@@ -67,36 +68,37 @@
 	protected static final Sorting SORTING_EDEFAULT = Sorting.NONE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SORTING_EFLAG_OFFSET = 12;
 
 	/**
-	 * The flags representing the default value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SORTING_EFLAG_DEFAULT = Sorting.VALUES.indexOf(SORTING_EDEFAULT) << SORTING_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link Sorting Sorting}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link Sorting Sorting}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Sorting[] SORTING_EFLAG_VALUES = (Sorting[])Sorting.VALUES.toArray(new Sorting[Sorting.VALUES.size()]);
+	private static final Sorting[] SORTING_EFLAG_VALUES = (Sorting[]) Sorting.VALUES
+			.toArray(new Sorting[Sorting.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSorting()
 	 * @generated
 	 * @ordered
@@ -104,9 +106,9 @@
 	protected static final int SORTING_EFLAG = 0x3 << SORTING_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortingKeys()
 	 * @generated
 	 * @ordered
@@ -114,9 +116,9 @@
 	protected static final Map SORTING_KEYS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortingKeys()
 	 * @generated
 	 * @ordered
@@ -124,9 +126,9 @@
 	protected Map sortingKeys = SORTING_KEYS_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getSortedObjects() <em>Sorted Objects</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSortedObjects() <em>Sorted Objects</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortedObjects()
 	 * @generated
 	 * @ordered
@@ -134,9 +136,9 @@
 	protected EList sortedObjects;
 
 	/**
-	 * The default value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFiltering() <em>Filtering</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFiltering()
 	 * @generated
 	 * @ordered
@@ -144,36 +146,38 @@
 	protected static final Filtering FILTERING_EDEFAULT = Filtering.NONE_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int FILTERING_EFLAG_OFFSET = 14;
 
 	/**
-	 * The flags representing the default value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int FILTERING_EFLAG_DEFAULT = Filtering.VALUES.indexOf(FILTERING_EDEFAULT) << FILTERING_EFLAG_OFFSET;
+	protected static final int FILTERING_EFLAG_DEFAULT = Filtering.VALUES
+			.indexOf(FILTERING_EDEFAULT) << FILTERING_EFLAG_OFFSET;
 
 	/**
-	 * The array of enumeration values for '{@link Filtering Filtering}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The array of enumeration values for '{@link Filtering Filtering}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Filtering[] FILTERING_EFLAG_VALUES = (Filtering[])Filtering.VALUES.toArray(new Filtering[Filtering.VALUES.size()]);
+	private static final Filtering[] FILTERING_EFLAG_VALUES = (Filtering[]) Filtering.VALUES
+			.toArray(new Filtering[Filtering.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getFiltering()
+	 * <em>Filtering</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFiltering()
 	 * @generated
 	 * @ordered
@@ -181,9 +185,9 @@
 	protected static final int FILTERING_EFLAG = 0x3 << FILTERING_EFLAG_OFFSET;
 
 	/**
-	 * The default value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFilteringKeys() <em>Filtering
+	 * Keys</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteringKeys()
 	 * @generated
 	 * @ordered
@@ -191,9 +195,9 @@
 	protected static final List FILTERING_KEYS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilteringKeys() <em>Filtering Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteringKeys()
 	 * @generated
 	 * @ordered
@@ -201,9 +205,9 @@
 	protected List filteringKeys = FILTERING_KEYS_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getFilteredObjects() <em>Filtered Objects</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilteredObjects() <em>Filtered
+	 * Objects</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilteredObjects()
 	 * @generated
 	 * @ordered
@@ -211,9 +215,9 @@
 	protected EList filteredObjects;
 
 	/**
-	 * The default value of the '{@link #isShowTitle() <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isShowTitle() <em>Show Title</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isShowTitle()
 	 * @generated
 	 * @ordered
@@ -221,9 +225,9 @@
 	protected static final boolean SHOW_TITLE_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isShowTitle() <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isShowTitle() <em>Show
+	 * Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isShowTitle()
 	 * @generated
 	 * @ordered
@@ -231,8 +235,8 @@
 	protected static final int SHOW_TITLE_EFLAG = 1 << 16;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SemanticListCompartmentImpl() {
@@ -240,8 +244,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -249,8 +253,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Sorting getSorting() {
@@ -258,21 +262,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSorting(Sorting newSorting) {
 		Sorting oldSorting = SORTING_EFLAG_VALUES[(eFlags & SORTING_EFLAG) >>> SORTING_EFLAG_OFFSET];
-		if (newSorting == null) newSorting = SORTING_EDEFAULT;
+		if (newSorting == null)
+			newSorting = SORTING_EDEFAULT;
 		eFlags = eFlags & ~SORTING_EFLAG | Sorting.VALUES.indexOf(newSorting) << SORTING_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING, oldSorting, newSorting));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING,
+					oldSorting, newSorting));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Map getSortingKeys() {
@@ -280,32 +286,34 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSortingKeys(Map newSortingKeys) {
 		Map oldSortingKeys = sortingKeys;
 		sortingKeys = newSortingKeys;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS, oldSortingKeys, sortingKeys));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS, oldSortingKeys, sortingKeys));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getSortedObjects() {
 		if (sortedObjects == null) {
-			sortedObjects = new EObjectResolvingEList(EObject.class, this, NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS);
+			sortedObjects = new EObjectResolvingEList(EObject.class, this,
+					NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS);
 		}
 		return sortedObjects;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Filtering getFiltering() {
@@ -313,21 +321,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFiltering(Filtering newFiltering) {
 		Filtering oldFiltering = FILTERING_EFLAG_VALUES[(eFlags & FILTERING_EFLAG) >>> FILTERING_EFLAG_OFFSET];
-		if (newFiltering == null) newFiltering = FILTERING_EDEFAULT;
+		if (newFiltering == null)
+			newFiltering = FILTERING_EDEFAULT;
 		eFlags = eFlags & ~FILTERING_EFLAG | Filtering.VALUES.indexOf(newFiltering) << FILTERING_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING, oldFiltering, newFiltering));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING,
+					oldFiltering, newFiltering));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public List getFilteringKeys() {
@@ -335,32 +345,34 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFilteringKeys(List newFilteringKeys) {
 		List oldFilteringKeys = filteringKeys;
 		filteringKeys = newFilteringKeys;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS, oldFilteringKeys, filteringKeys));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS, oldFilteringKeys, filteringKeys));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getFilteredObjects() {
 		if (filteredObjects == null) {
-			filteredObjects = new EObjectResolvingEList(EObject.class, this, NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS);
+			filteredObjects = new EObjectResolvingEList(EObject.class, this,
+					NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS);
 		}
 		return filteredObjects;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isShowTitle() {
@@ -368,253 +380,259 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setShowTitle(boolean newShowTitle) {
 		boolean oldShowTitle = (eFlags & SHOW_TITLE_EFLAG) != 0;
-		if (newShowTitle) eFlags |= SHOW_TITLE_EFLAG; else eFlags &= ~SHOW_TITLE_EFLAG;
+		if (newShowTitle)
+			eFlags |= SHOW_TITLE_EFLAG;
+		else
+			eFlags &= ~SHOW_TITLE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE, oldShowTitle, newShowTitle));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE,
+					oldShowTitle, newShowTitle));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TYPE:
-				return getType();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
-				return getStyles();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__COLLAPSED:
-				return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
-				return getSorting();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
-				return getSortingKeys();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
-				return getSortedObjects();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
-				return getFiltering();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
-				return getFilteringKeys();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
-				return getFilteredObjects();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
-				return isShowTitle() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TYPE:
+			return getType();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
+			return getStyles();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__COLLAPSED:
+			return isCollapsed() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
+			return getSorting();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
+			return getSortingKeys();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
+			return getSortedObjects();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
+			return getFiltering();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
+			return getFilteringKeys();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
+			return getFilteredObjects();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
+			return isShowTitle() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				return;
-			default:
-				eSetGen(featureID, newValue);
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			return;
+		default:
+			eSetGen(featureID, newValue);
 		}
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSetGen(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__COLLAPSED:
-				setCollapsed(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
-				setSorting((Sorting)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
-				setSortingKeys((Map)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
-				getSortedObjects().clear();
-				getSortedObjects().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
-				setFiltering((Filtering)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
-				setFilteringKeys((List)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
-				getFilteredObjects().clear();
-				getFilteredObjects().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
-				setShowTitle(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__COLLAPSED:
+			setCollapsed(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
+			setSorting((Sorting) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
+			setSortingKeys((Map) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
+			getSortedObjects().clear();
+			getSortedObjects().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
+			setFiltering((Filtering) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
+			setFilteringKeys((List) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
+			getFilteredObjects().clear();
+			getFilteredObjects().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
+			setShowTitle(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				return;
-			default:
-				eUnsetGen(featureID);
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			return;
+		default:
+			eUnsetGen(featureID);
 		}
 	}
 
-		/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnsetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)null);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__COLLAPSED:
-				setCollapsed(COLLAPSED_EDEFAULT);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
-				setSorting(SORTING_EDEFAULT);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
-				setSortingKeys(SORTING_KEYS_EDEFAULT);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
-				getSortedObjects().clear();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
-				setFiltering(FILTERING_EDEFAULT);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
-				setFilteringKeys(FILTERING_KEYS_EDEFAULT);
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
-				getFilteredObjects().clear();
-				return;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
-				setShowTitle(SHOW_TITLE_EDEFAULT);
-				return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) null);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__COLLAPSED:
+			setCollapsed(COLLAPSED_EDEFAULT);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
+			setSorting(SORTING_EDEFAULT);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
+			setSortingKeys(SORTING_KEYS_EDEFAULT);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
+			getSortedObjects().clear();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
+			setFiltering(FILTERING_EDEFAULT);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
+			setFilteringKeys(FILTERING_KEYS_EDEFAULT);
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
+			getFilteredObjects().clear();
+			return;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
+			setShowTitle(SHOW_TITLE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean eIsSet(int featureID) {
@@ -631,121 +649,143 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT_CDO
 	 */
 	public boolean eIsSetGen(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
-				return false;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__ELEMENT:
-				return isSetElement();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
-				return layoutConstraint != null;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__COLLAPSED:
-				return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
-				return (eFlags & SORTING_EFLAG) != SORTING_EFLAG_DEFAULT;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
-				return SORTING_KEYS_EDEFAULT == null ? sortingKeys != null : !SORTING_KEYS_EDEFAULT.equals(sortingKeys);
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
-				return sortedObjects != null && !sortedObjects.isEmpty();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
-				return (eFlags & FILTERING_EFLAG) != FILTERING_EFLAG_DEFAULT;
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
-				return FILTERING_KEYS_EDEFAULT == null ? filteringKeys != null : !FILTERING_KEYS_EDEFAULT.equals(filteringKeys);
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
-				return filteredObjects != null && !filteredObjects.isEmpty();
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
-				return ((eFlags & SHOW_TITLE_EFLAG) != 0) != SHOW_TITLE_EDEFAULT;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SOURCE_EDGES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TARGET_EDGES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__PERSISTED_CHILDREN:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__STYLES:
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__TRANSIENT_CHILDREN:
+			return false;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__ELEMENT:
+			return isSetElement();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__LAYOUT_CONSTRAINT:
+			return layoutConstraint != null;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__COLLAPSED:
+			return ((eFlags & COLLAPSED_EFLAG) != 0) != COLLAPSED_EDEFAULT;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
+			return (eFlags & SORTING_EFLAG) != SORTING_EFLAG_DEFAULT;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
+			return SORTING_KEYS_EDEFAULT == null ? sortingKeys != null : !SORTING_KEYS_EDEFAULT.equals(sortingKeys);
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
+			return sortedObjects != null && !sortedObjects.isEmpty();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
+			return (eFlags & FILTERING_EFLAG) != FILTERING_EFLAG_DEFAULT;
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
+			return FILTERING_KEYS_EDEFAULT == null ? filteringKeys != null
+					: !FILTERING_KEYS_EDEFAULT.equals(filteringKeys);
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
+			return filteredObjects != null && !filteredObjects.isEmpty();
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
+			return ((eFlags & SHOW_TITLE_EFLAG) != 0) != SHOW_TITLE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == SortingStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING: return NotationPackage.SORTING_STYLE__SORTING;
-				case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS: return NotationPackage.SORTING_STYLE__SORTING_KEYS;
-				case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS: return NotationPackage.SORTING_STYLE__SORTED_OBJECTS;
-				default: return -1;
+			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING:
+				return NotationPackage.SORTING_STYLE__SORTING;
+			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS:
+				return NotationPackage.SORTING_STYLE__SORTING_KEYS;
+			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS:
+				return NotationPackage.SORTING_STYLE__SORTED_OBJECTS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FilteringStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING: return NotationPackage.FILTERING_STYLE__FILTERING;
-				case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS: return NotationPackage.FILTERING_STYLE__FILTERING_KEYS;
-				case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS: return NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS;
-				default: return -1;
+			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING:
+				return NotationPackage.FILTERING_STYLE__FILTERING;
+			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS:
+				return NotationPackage.FILTERING_STYLE__FILTERING_KEYS;
+			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS:
+				return NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == TitleStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE: return NotationPackage.TITLE_STYLE__SHOW_TITLE;
-				default: return -1;
+			case NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE:
+				return NotationPackage.TITLE_STYLE__SHOW_TITLE;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == SortingStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.SORTING_STYLE__SORTING: return NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING;
-				case NotationPackage.SORTING_STYLE__SORTING_KEYS: return NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS;
-				case NotationPackage.SORTING_STYLE__SORTED_OBJECTS: return NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS;
-				default: return -1;
+			case NotationPackage.SORTING_STYLE__SORTING:
+				return NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING;
+			case NotationPackage.SORTING_STYLE__SORTING_KEYS:
+				return NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTING_KEYS;
+			case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
+				return NotationPackage.SEMANTIC_LIST_COMPARTMENT__SORTED_OBJECTS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FilteringStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.FILTERING_STYLE__FILTERING: return NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING;
-				case NotationPackage.FILTERING_STYLE__FILTERING_KEYS: return NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS;
-				case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS: return NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS;
-				default: return -1;
+			case NotationPackage.FILTERING_STYLE__FILTERING:
+				return NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING;
+			case NotationPackage.FILTERING_STYLE__FILTERING_KEYS:
+				return NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERING_KEYS;
+			case NotationPackage.FILTERING_STYLE__FILTERED_OBJECTS:
+				return NotationPackage.SEMANTIC_LIST_COMPARTMENT__FILTERED_OBJECTS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == TitleStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.TITLE_STYLE__SHOW_TITLE: return NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE;
-				default: return -1;
+			case NotationPackage.TITLE_STYLE__SHOW_TITLE:
+				return NotationPackage.SEMANTIC_LIST_COMPARTMENT__SHOW_TITLE;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (sorting: "); //$NON-NLS-1$
@@ -762,4 +802,4 @@
 		return result.toString();
 	}
 
-} //SemanticListCompartmentImpl
+} // SemanticListCompartmentImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ShapeImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ShapeImpl.java
index 4103b48..c402899 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ShapeImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ShapeImpl.java
@@ -14,12 +14,9 @@
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.DescriptionStyle;
 import org.eclipse.gmf.runtime.notation.FillStyle;
 import org.eclipse.gmf.runtime.notation.FontStyle;
@@ -33,36 +30,49 @@
 import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Shape</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Shape</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getFontColor <em>Font Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getFontName <em>Font Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getFontHeight <em>Font Height</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#isBold <em>Bold</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#isItalic <em>Italic</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#isUnderline <em>Underline</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#isStrikeThrough <em>Strike Through</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getFillColor <em>Fill Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getTransparency <em>Transparency</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getGradient <em>Gradient</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getLineColor <em>Line Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getLineWidth <em>Line Width</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getRoundedBendpointsRadius <em>Rounded Bendpoints Radius</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getFontColor
+ * <em>Font Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getFontName
+ * <em>Font Name</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getFontHeight
+ * <em>Font Height</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#isBold
+ * <em>Bold</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#isItalic
+ * <em>Italic</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#isUnderline
+ * <em>Underline</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#isStrikeThrough
+ * <em>Strike Through</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getDescription
+ * <em>Description</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getFillColor
+ * <em>Fill Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getTransparency
+ * <em>Transparency</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getGradient
+ * <em>Gradient</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getLineColor
+ * <em>Line Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getLineWidth
+ * <em>Line Width</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeImpl#getRoundedBendpointsRadius
+ * <em>Rounded Bendpoints Radius</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class ShapeImpl extends NodeImpl implements Shape {
 	/**
-	 * The default value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFontColor() <em>Font Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontColor()
 	 * @generated
 	 * @ordered
@@ -70,9 +80,9 @@
 	protected static final int FONT_COLOR_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontColor()
 	 * @generated
 	 * @ordered
@@ -80,9 +90,9 @@
 	protected int fontColor = FONT_COLOR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFontName() <em>Font Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
@@ -90,9 +100,9 @@
 	protected static final String FONT_NAME_EDEFAULT = "Tahoma"; //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
@@ -100,9 +110,9 @@
 	protected String fontName = FONT_NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontHeight()
 	 * @generated
 	 * @ordered
@@ -110,9 +120,9 @@
 	protected static final int FONT_HEIGHT_EDEFAULT = 9;
 
 	/**
-	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontHeight()
 	 * @generated
 	 * @ordered
@@ -120,9 +130,9 @@
 	protected int fontHeight = FONT_HEIGHT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isBold()
 	 * @generated
 	 * @ordered
@@ -130,9 +140,9 @@
 	protected static final boolean BOLD_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isBold() <em>Bold</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isBold() <em>Bold</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isBold()
 	 * @generated
 	 * @ordered
@@ -141,8 +151,8 @@
 
 	/**
 	 * The default value of the '{@link #isItalic() <em>Italic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isItalic()
 	 * @generated
 	 * @ordered
@@ -150,9 +160,9 @@
 	protected static final boolean ITALIC_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isItalic() <em>Italic</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isItalic() <em>Italic</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isItalic()
 	 * @generated
 	 * @ordered
@@ -160,9 +170,9 @@
 	protected static final int ITALIC_EFLAG = 1 << 12;
 
 	/**
-	 * The default value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isUnderline() <em>Underline</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isUnderline()
 	 * @generated
 	 * @ordered
@@ -170,9 +180,9 @@
 	protected static final boolean UNDERLINE_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isUnderline()
+	 * <em>Underline</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isUnderline()
 	 * @generated
 	 * @ordered
@@ -180,9 +190,9 @@
 	protected static final int UNDERLINE_EFLAG = 1 << 13;
 
 	/**
-	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isStrikeThrough()
 	 * @generated
 	 * @ordered
@@ -190,9 +200,9 @@
 	protected static final boolean STRIKE_THROUGH_EDEFAULT = false;
 
 	/**
-	 * The flag representing the value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flag representing the value of the '{@link #isStrikeThrough() <em>Strike
+	 * Through</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isStrikeThrough()
 	 * @generated
 	 * @ordered
@@ -200,9 +210,9 @@
 	protected static final int STRIKE_THROUGH_EFLAG = 1 << 14;
 
 	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
@@ -210,9 +220,9 @@
 	protected static final String DESCRIPTION_EDEFAULT = ""; //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
@@ -220,9 +230,9 @@
 	protected String description = DESCRIPTION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getFillColor() <em>Fill Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFillColor() <em>Fill Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFillColor()
 	 * @generated
 	 * @ordered
@@ -230,9 +240,9 @@
 	protected static final int FILL_COLOR_EDEFAULT = 16777215;
 
 	/**
-	 * The cached value of the '{@link #getFillColor() <em>Fill Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFillColor() <em>Fill Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFillColor()
 	 * @generated
 	 * @ordered
@@ -240,9 +250,9 @@
 	protected int fillColor = FILL_COLOR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTransparency() <em>Transparency</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTransparency() <em>Transparency</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTransparency()
 	 * @generated
 	 * @ordered
@@ -250,9 +260,9 @@
 	protected static final int TRANSPARENCY_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getTransparency() <em>Transparency</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTransparency() <em>Transparency</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTransparency()
 	 * @generated
 	 * @ordered
@@ -260,9 +270,9 @@
 	protected int transparency = TRANSPARENCY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getGradient() <em>Gradient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getGradient() <em>Gradient</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGradient()
 	 * @generated
 	 * @ordered
@@ -271,8 +281,8 @@
 
 	/**
 	 * The cached value of the '{@link #getGradient() <em>Gradient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGradient()
 	 * @generated
 	 * @ordered
@@ -280,9 +290,9 @@
 	protected GradientData gradient = GRADIENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
@@ -290,9 +300,9 @@
 	protected static final int LINE_COLOR_EDEFAULT = 11579568;
 
 	/**
-	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
@@ -300,9 +310,9 @@
 	protected int lineColor = LINE_COLOR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
@@ -310,9 +320,9 @@
 	protected static final int LINE_WIDTH_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
@@ -320,30 +330,32 @@
 	protected int lineWidth = LINE_WIDTH_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getRoundedBendpointsRadius() <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRoundedBendpointsRadius() <em>Rounded
+	 * Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 * @ordered
-     * @since 1.4
+	 * @since 1.4
 	 */
 	protected static final int ROUNDED_BENDPOINTS_RADIUS_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getRoundedBendpointsRadius() <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRoundedBendpointsRadius() <em>Rounded
+	 * Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 * @ordered
-     * @since 1.4
+	 * @since 1.4
 	 */
 	protected int roundedBendpointsRadius = ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ShapeImpl() {
@@ -351,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -360,8 +372,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getFontColor() {
@@ -369,20 +381,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontColor(int newFontColor) {
 		int oldFontColor = fontColor;
 		fontColor = newFontColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__FONT_COLOR, oldFontColor, fontColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__FONT_COLOR, oldFontColor,
+					fontColor));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getFontName() {
@@ -390,8 +403,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setFontName(String newFontName) {
@@ -399,20 +412,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontNameGen(String newFontName) {
 		String oldFontName = fontName;
 		fontName = newFontName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__FONT_NAME, oldFontName, fontName));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__FONT_NAME, oldFontName,
+					fontName));
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getFontHeight() {
@@ -420,20 +434,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontHeight(int newFontHeight) {
 		int oldFontHeight = fontHeight;
 		fontHeight = newFontHeight;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__FONT_HEIGHT, oldFontHeight, fontHeight));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__FONT_HEIGHT, oldFontHeight,
+					fontHeight));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isBold() {
@@ -441,20 +456,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBold(boolean newBold) {
 		boolean oldBold = (eFlags & BOLD_EFLAG) != 0;
-		if (newBold) eFlags |= BOLD_EFLAG; else eFlags &= ~BOLD_EFLAG;
+		if (newBold)
+			eFlags |= BOLD_EFLAG;
+		else
+			eFlags &= ~BOLD_EFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__BOLD, oldBold, newBold));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isItalic() {
@@ -462,20 +480,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setItalic(boolean newItalic) {
 		boolean oldItalic = (eFlags & ITALIC_EFLAG) != 0;
-		if (newItalic) eFlags |= ITALIC_EFLAG; else eFlags &= ~ITALIC_EFLAG;
+		if (newItalic)
+			eFlags |= ITALIC_EFLAG;
+		else
+			eFlags &= ~ITALIC_EFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__ITALIC, oldItalic, newItalic));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isUnderline() {
@@ -483,20 +504,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setUnderline(boolean newUnderline) {
 		boolean oldUnderline = (eFlags & UNDERLINE_EFLAG) != 0;
-		if (newUnderline) eFlags |= UNDERLINE_EFLAG; else eFlags &= ~UNDERLINE_EFLAG;
+		if (newUnderline)
+			eFlags |= UNDERLINE_EFLAG;
+		else
+			eFlags &= ~UNDERLINE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__UNDERLINE, oldUnderline, newUnderline));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__UNDERLINE, oldUnderline,
+					newUnderline));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isStrikeThrough() {
@@ -504,20 +529,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStrikeThrough(boolean newStrikeThrough) {
 		boolean oldStrikeThrough = (eFlags & STRIKE_THROUGH_EFLAG) != 0;
-		if (newStrikeThrough) eFlags |= STRIKE_THROUGH_EFLAG; else eFlags &= ~STRIKE_THROUGH_EFLAG;
+		if (newStrikeThrough)
+			eFlags |= STRIKE_THROUGH_EFLAG;
+		else
+			eFlags &= ~STRIKE_THROUGH_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__STRIKE_THROUGH, oldStrikeThrough, newStrikeThrough));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__STRIKE_THROUGH,
+					oldStrikeThrough, newStrikeThrough));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDescription() {
@@ -525,20 +554,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDescription(String newDescription) {
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__DESCRIPTION, oldDescription,
+					description));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getFillColor() {
@@ -546,20 +576,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFillColor(int newFillColor) {
 		int oldFillColor = fillColor;
 		fillColor = newFillColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__FILL_COLOR, oldFillColor, fillColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__FILL_COLOR, oldFillColor,
+					fillColor));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getTransparency() {
@@ -567,20 +598,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTransparency(int newTransparency) {
 		int oldTransparency = transparency;
 		transparency = newTransparency;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__TRANSPARENCY, oldTransparency, transparency));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__TRANSPARENCY, oldTransparency,
+					transparency));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GradientData getGradient() {
@@ -588,20 +620,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGradient(GradientData newGradient) {
 		GradientData oldGradient = gradient;
 		gradient = newGradient;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__GRADIENT, oldGradient, gradient));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__GRADIENT, oldGradient,
+					gradient));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineColor() {
@@ -609,20 +642,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineColor(int newLineColor) {
 		int oldLineColor = lineColor;
 		lineColor = newLineColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__LINE_COLOR, oldLineColor, lineColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__LINE_COLOR, oldLineColor,
+					lineColor));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineWidth() {
@@ -630,469 +664,516 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineWidth(int newLineWidth) {
 		int oldLineWidth = lineWidth;
 		lineWidth = newLineWidth;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__LINE_WIDTH, oldLineWidth, lineWidth));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__LINE_WIDTH, oldLineWidth,
+					lineWidth));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public int getRoundedBendpointsRadius() {
 		return roundedBendpointsRadius;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public void setRoundedBendpointsRadius(int newRoundedBendpointsRadius) {
 		int oldRoundedBendpointsRadius = roundedBendpointsRadius;
 		roundedBendpointsRadius = newRoundedBendpointsRadius;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS, oldRoundedBendpointsRadius, roundedBendpointsRadius));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS,
+					oldRoundedBendpointsRadius, roundedBendpointsRadius));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.SHAPE__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.SHAPE__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE__TYPE:
-				return getType();
-			case NotationPackage.SHAPE__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.SHAPE__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.SHAPE__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.SHAPE__STYLES:
-				return getStyles();
-			case NotationPackage.SHAPE__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.SHAPE__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.SHAPE__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.SHAPE__LAYOUT_CONSTRAINT:
-				return getLayoutConstraint();
-			case NotationPackage.SHAPE__FONT_COLOR:
-				return new Integer(getFontColor());
-			case NotationPackage.SHAPE__FONT_NAME:
-				return getFontName();
-			case NotationPackage.SHAPE__FONT_HEIGHT:
-				return new Integer(getFontHeight());
-			case NotationPackage.SHAPE__BOLD:
-				return isBold() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE__ITALIC:
-				return isItalic() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE__UNDERLINE:
-				return isUnderline() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE__STRIKE_THROUGH:
-				return isStrikeThrough() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE__DESCRIPTION:
-				return getDescription();
-			case NotationPackage.SHAPE__FILL_COLOR:
-				return new Integer(getFillColor());
-			case NotationPackage.SHAPE__TRANSPARENCY:
-				return new Integer(getTransparency());
-			case NotationPackage.SHAPE__GRADIENT:
-				return getGradient();
-			case NotationPackage.SHAPE__LINE_COLOR:
-				return new Integer(getLineColor());
-			case NotationPackage.SHAPE__LINE_WIDTH:
-				return new Integer(getLineWidth());
-			case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
-				return new Integer(getRoundedBendpointsRadius());
+		case NotationPackage.SHAPE__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.SHAPE__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE__TYPE:
+			return getType();
+		case NotationPackage.SHAPE__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.SHAPE__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.SHAPE__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.SHAPE__STYLES:
+			return getStyles();
+		case NotationPackage.SHAPE__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.SHAPE__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.SHAPE__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.SHAPE__LAYOUT_CONSTRAINT:
+			return getLayoutConstraint();
+		case NotationPackage.SHAPE__FONT_COLOR:
+			return new Integer(getFontColor());
+		case NotationPackage.SHAPE__FONT_NAME:
+			return getFontName();
+		case NotationPackage.SHAPE__FONT_HEIGHT:
+			return new Integer(getFontHeight());
+		case NotationPackage.SHAPE__BOLD:
+			return isBold() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE__ITALIC:
+			return isItalic() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE__UNDERLINE:
+			return isUnderline() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE__STRIKE_THROUGH:
+			return isStrikeThrough() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE__DESCRIPTION:
+			return getDescription();
+		case NotationPackage.SHAPE__FILL_COLOR:
+			return new Integer(getFillColor());
+		case NotationPackage.SHAPE__TRANSPARENCY:
+			return new Integer(getTransparency());
+		case NotationPackage.SHAPE__GRADIENT:
+			return getGradient();
+		case NotationPackage.SHAPE__LINE_COLOR:
+			return new Integer(getLineColor());
+		case NotationPackage.SHAPE__LINE_WIDTH:
+			return new Integer(getLineWidth());
+		case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
+			return new Integer(getRoundedBendpointsRadius());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.SHAPE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SHAPE__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.SHAPE__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SHAPE__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SHAPE__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SHAPE__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SHAPE__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.SHAPE__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.SHAPE__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)newValue);
-				return;
-			case NotationPackage.SHAPE__FONT_COLOR:
-				setFontColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE__FONT_NAME:
-				setFontName((String)newValue);
-				return;
-			case NotationPackage.SHAPE__FONT_HEIGHT:
-				setFontHeight(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE__BOLD:
-				setBold(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE__ITALIC:
-				setItalic(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE__UNDERLINE:
-				setUnderline(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE__STRIKE_THROUGH:
-				setStrikeThrough(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case NotationPackage.SHAPE__FILL_COLOR:
-				setFillColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE__TRANSPARENCY:
-				setTransparency(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE__GRADIENT:
-				setGradient((GradientData)newValue);
-				return;
-			case NotationPackage.SHAPE__LINE_COLOR:
-				setLineColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE__LINE_WIDTH:
-				setLineWidth(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.SHAPE__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SHAPE__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.SHAPE__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SHAPE__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SHAPE__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SHAPE__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SHAPE__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.SHAPE__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.SHAPE__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) newValue);
+			return;
+		case NotationPackage.SHAPE__FONT_COLOR:
+			setFontColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE__FONT_NAME:
+			setFontName((String) newValue);
+			return;
+		case NotationPackage.SHAPE__FONT_HEIGHT:
+			setFontHeight(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE__BOLD:
+			setBold(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE__ITALIC:
+			setItalic(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE__UNDERLINE:
+			setUnderline(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE__STRIKE_THROUGH:
+			setStrikeThrough(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
+		case NotationPackage.SHAPE__FILL_COLOR:
+			setFillColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE__TRANSPARENCY:
+			setTransparency(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE__GRADIENT:
+			setGradient((GradientData) newValue);
+			return;
+		case NotationPackage.SHAPE__LINE_COLOR:
+			setLineColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE__LINE_WIDTH:
+			setLineWidth(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SHAPE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.SHAPE__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.SHAPE__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.SHAPE__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.SHAPE__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.SHAPE__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.SHAPE__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.SHAPE__LAYOUT_CONSTRAINT:
-				setLayoutConstraint((LayoutConstraint)null);
-				return;
-			case NotationPackage.SHAPE__FONT_COLOR:
-				setFontColor(FONT_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__FONT_NAME:
-				setFontName(FONT_NAME_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__FONT_HEIGHT:
-				setFontHeight(FONT_HEIGHT_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__BOLD:
-				setBold(BOLD_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__ITALIC:
-				setItalic(ITALIC_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__UNDERLINE:
-				setUnderline(UNDERLINE_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__STRIKE_THROUGH:
-				setStrikeThrough(STRIKE_THROUGH_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__FILL_COLOR:
-				setFillColor(FILL_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__TRANSPARENCY:
-				setTransparency(TRANSPARENCY_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__GRADIENT:
-				setGradient(GRADIENT_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__LINE_COLOR:
-				setLineColor(LINE_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__LINE_WIDTH:
-				setLineWidth(LINE_WIDTH_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
-				return;
+		case NotationPackage.SHAPE__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.SHAPE__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.SHAPE__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.SHAPE__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.SHAPE__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.SHAPE__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.SHAPE__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.SHAPE__LAYOUT_CONSTRAINT:
+			setLayoutConstraint((LayoutConstraint) null);
+			return;
+		case NotationPackage.SHAPE__FONT_COLOR:
+			setFontColor(FONT_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__FONT_NAME:
+			setFontName(FONT_NAME_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__FONT_HEIGHT:
+			setFontHeight(FONT_HEIGHT_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__BOLD:
+			setBold(BOLD_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__ITALIC:
+			setItalic(ITALIC_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__UNDERLINE:
+			setUnderline(UNDERLINE_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__STRIKE_THROUGH:
+			setStrikeThrough(STRIKE_THROUGH_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__FILL_COLOR:
+			setFillColor(FILL_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__TRANSPARENCY:
+			setTransparency(TRANSPARENCY_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__GRADIENT:
+			setGradient(GRADIENT_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__LINE_COLOR:
+			setLineColor(LINE_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__LINE_WIDTH:
+			setLineWidth(LINE_WIDTH_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SHAPE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.SHAPE__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.SHAPE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.SHAPE__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.SHAPE__SOURCE_EDGES:
-				return sourceEdges != null && !sourceEdges.isEmpty();
-			case NotationPackage.SHAPE__TARGET_EDGES:
-				return targetEdges != null && !targetEdges.isEmpty();
-			case NotationPackage.SHAPE__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.SHAPE__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.SHAPE__ELEMENT:
-				return isSetElement();
-			case NotationPackage.SHAPE__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.SHAPE__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.SHAPE__LAYOUT_CONSTRAINT:
-				return layoutConstraint != null;
-			case NotationPackage.SHAPE__FONT_COLOR:
-				return fontColor != FONT_COLOR_EDEFAULT;
-			case NotationPackage.SHAPE__FONT_NAME:
-				return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
-			case NotationPackage.SHAPE__FONT_HEIGHT:
-				return fontHeight != FONT_HEIGHT_EDEFAULT;
-			case NotationPackage.SHAPE__BOLD:
-				return ((eFlags & BOLD_EFLAG) != 0) != BOLD_EDEFAULT;
-			case NotationPackage.SHAPE__ITALIC:
-				return ((eFlags & ITALIC_EFLAG) != 0) != ITALIC_EDEFAULT;
-			case NotationPackage.SHAPE__UNDERLINE:
-				return ((eFlags & UNDERLINE_EFLAG) != 0) != UNDERLINE_EDEFAULT;
-			case NotationPackage.SHAPE__STRIKE_THROUGH:
-				return ((eFlags & STRIKE_THROUGH_EFLAG) != 0) != STRIKE_THROUGH_EDEFAULT;
-			case NotationPackage.SHAPE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case NotationPackage.SHAPE__FILL_COLOR:
-				return fillColor != FILL_COLOR_EDEFAULT;
-			case NotationPackage.SHAPE__TRANSPARENCY:
-				return transparency != TRANSPARENCY_EDEFAULT;
-			case NotationPackage.SHAPE__GRADIENT:
-				return GRADIENT_EDEFAULT == null ? gradient != null : !GRADIENT_EDEFAULT.equals(gradient);
-			case NotationPackage.SHAPE__LINE_COLOR:
-				return lineColor != LINE_COLOR_EDEFAULT;
-			case NotationPackage.SHAPE__LINE_WIDTH:
-				return lineWidth != LINE_WIDTH_EDEFAULT;
-			case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
-				return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
+		case NotationPackage.SHAPE__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.SHAPE__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.SHAPE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.SHAPE__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.SHAPE__SOURCE_EDGES:
+			return sourceEdges != null && !sourceEdges.isEmpty();
+		case NotationPackage.SHAPE__TARGET_EDGES:
+			return targetEdges != null && !targetEdges.isEmpty();
+		case NotationPackage.SHAPE__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.SHAPE__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.SHAPE__ELEMENT:
+			return isSetElement();
+		case NotationPackage.SHAPE__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.SHAPE__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.SHAPE__LAYOUT_CONSTRAINT:
+			return layoutConstraint != null;
+		case NotationPackage.SHAPE__FONT_COLOR:
+			return fontColor != FONT_COLOR_EDEFAULT;
+		case NotationPackage.SHAPE__FONT_NAME:
+			return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
+		case NotationPackage.SHAPE__FONT_HEIGHT:
+			return fontHeight != FONT_HEIGHT_EDEFAULT;
+		case NotationPackage.SHAPE__BOLD:
+			return ((eFlags & BOLD_EFLAG) != 0) != BOLD_EDEFAULT;
+		case NotationPackage.SHAPE__ITALIC:
+			return ((eFlags & ITALIC_EFLAG) != 0) != ITALIC_EDEFAULT;
+		case NotationPackage.SHAPE__UNDERLINE:
+			return ((eFlags & UNDERLINE_EFLAG) != 0) != UNDERLINE_EDEFAULT;
+		case NotationPackage.SHAPE__STRIKE_THROUGH:
+			return ((eFlags & STRIKE_THROUGH_EFLAG) != 0) != STRIKE_THROUGH_EDEFAULT;
+		case NotationPackage.SHAPE__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case NotationPackage.SHAPE__FILL_COLOR:
+			return fillColor != FILL_COLOR_EDEFAULT;
+		case NotationPackage.SHAPE__TRANSPARENCY:
+			return transparency != TRANSPARENCY_EDEFAULT;
+		case NotationPackage.SHAPE__GRADIENT:
+			return GRADIENT_EDEFAULT == null ? gradient != null : !GRADIENT_EDEFAULT.equals(gradient);
+		case NotationPackage.SHAPE__LINE_COLOR:
+			return lineColor != LINE_COLOR_EDEFAULT;
+		case NotationPackage.SHAPE__LINE_WIDTH:
+			return lineWidth != LINE_WIDTH_EDEFAULT;
+		case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
+			return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FontStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE__FONT_COLOR: return NotationPackage.FONT_STYLE__FONT_COLOR;
-				case NotationPackage.SHAPE__FONT_NAME: return NotationPackage.FONT_STYLE__FONT_NAME;
-				case NotationPackage.SHAPE__FONT_HEIGHT: return NotationPackage.FONT_STYLE__FONT_HEIGHT;
-				case NotationPackage.SHAPE__BOLD: return NotationPackage.FONT_STYLE__BOLD;
-				case NotationPackage.SHAPE__ITALIC: return NotationPackage.FONT_STYLE__ITALIC;
-				case NotationPackage.SHAPE__UNDERLINE: return NotationPackage.FONT_STYLE__UNDERLINE;
-				case NotationPackage.SHAPE__STRIKE_THROUGH: return NotationPackage.FONT_STYLE__STRIKE_THROUGH;
-				default: return -1;
+			case NotationPackage.SHAPE__FONT_COLOR:
+				return NotationPackage.FONT_STYLE__FONT_COLOR;
+			case NotationPackage.SHAPE__FONT_NAME:
+				return NotationPackage.FONT_STYLE__FONT_NAME;
+			case NotationPackage.SHAPE__FONT_HEIGHT:
+				return NotationPackage.FONT_STYLE__FONT_HEIGHT;
+			case NotationPackage.SHAPE__BOLD:
+				return NotationPackage.FONT_STYLE__BOLD;
+			case NotationPackage.SHAPE__ITALIC:
+				return NotationPackage.FONT_STYLE__ITALIC;
+			case NotationPackage.SHAPE__UNDERLINE:
+				return NotationPackage.FONT_STYLE__UNDERLINE;
+			case NotationPackage.SHAPE__STRIKE_THROUGH:
+				return NotationPackage.FONT_STYLE__STRIKE_THROUGH;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DescriptionStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE__DESCRIPTION: return NotationPackage.DESCRIPTION_STYLE__DESCRIPTION;
-				default: return -1;
+			case NotationPackage.SHAPE__DESCRIPTION:
+				return NotationPackage.DESCRIPTION_STYLE__DESCRIPTION;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FillStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE__FILL_COLOR: return NotationPackage.FILL_STYLE__FILL_COLOR;
-				case NotationPackage.SHAPE__TRANSPARENCY: return NotationPackage.FILL_STYLE__TRANSPARENCY;
-				case NotationPackage.SHAPE__GRADIENT: return NotationPackage.FILL_STYLE__GRADIENT;
-				default: return -1;
+			case NotationPackage.SHAPE__FILL_COLOR:
+				return NotationPackage.FILL_STYLE__FILL_COLOR;
+			case NotationPackage.SHAPE__TRANSPARENCY:
+				return NotationPackage.FILL_STYLE__TRANSPARENCY;
+			case NotationPackage.SHAPE__GRADIENT:
+				return NotationPackage.FILL_STYLE__GRADIENT;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == LineStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE__LINE_COLOR: return NotationPackage.LINE_STYLE__LINE_COLOR;
-				case NotationPackage.SHAPE__LINE_WIDTH: return NotationPackage.LINE_STYLE__LINE_WIDTH;
-				default: return -1;
+			case NotationPackage.SHAPE__LINE_COLOR:
+				return NotationPackage.LINE_STYLE__LINE_COLOR;
+			case NotationPackage.SHAPE__LINE_WIDTH:
+				return NotationPackage.LINE_STYLE__LINE_WIDTH;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == RoundedCornersStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS: return NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS;
-				default: return -1;
+			case NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS:
+				return NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == ShapeStyle.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FontStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.FONT_STYLE__FONT_COLOR: return NotationPackage.SHAPE__FONT_COLOR;
-				case NotationPackage.FONT_STYLE__FONT_NAME: return NotationPackage.SHAPE__FONT_NAME;
-				case NotationPackage.FONT_STYLE__FONT_HEIGHT: return NotationPackage.SHAPE__FONT_HEIGHT;
-				case NotationPackage.FONT_STYLE__BOLD: return NotationPackage.SHAPE__BOLD;
-				case NotationPackage.FONT_STYLE__ITALIC: return NotationPackage.SHAPE__ITALIC;
-				case NotationPackage.FONT_STYLE__UNDERLINE: return NotationPackage.SHAPE__UNDERLINE;
-				case NotationPackage.FONT_STYLE__STRIKE_THROUGH: return NotationPackage.SHAPE__STRIKE_THROUGH;
-				default: return -1;
+			case NotationPackage.FONT_STYLE__FONT_COLOR:
+				return NotationPackage.SHAPE__FONT_COLOR;
+			case NotationPackage.FONT_STYLE__FONT_NAME:
+				return NotationPackage.SHAPE__FONT_NAME;
+			case NotationPackage.FONT_STYLE__FONT_HEIGHT:
+				return NotationPackage.SHAPE__FONT_HEIGHT;
+			case NotationPackage.FONT_STYLE__BOLD:
+				return NotationPackage.SHAPE__BOLD;
+			case NotationPackage.FONT_STYLE__ITALIC:
+				return NotationPackage.SHAPE__ITALIC;
+			case NotationPackage.FONT_STYLE__UNDERLINE:
+				return NotationPackage.SHAPE__UNDERLINE;
+			case NotationPackage.FONT_STYLE__STRIKE_THROUGH:
+				return NotationPackage.SHAPE__STRIKE_THROUGH;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DescriptionStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION: return NotationPackage.SHAPE__DESCRIPTION;
-				default: return -1;
+			case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
+				return NotationPackage.SHAPE__DESCRIPTION;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FillStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.FILL_STYLE__FILL_COLOR: return NotationPackage.SHAPE__FILL_COLOR;
-				case NotationPackage.FILL_STYLE__TRANSPARENCY: return NotationPackage.SHAPE__TRANSPARENCY;
-				case NotationPackage.FILL_STYLE__GRADIENT: return NotationPackage.SHAPE__GRADIENT;
-				default: return -1;
+			case NotationPackage.FILL_STYLE__FILL_COLOR:
+				return NotationPackage.SHAPE__FILL_COLOR;
+			case NotationPackage.FILL_STYLE__TRANSPARENCY:
+				return NotationPackage.SHAPE__TRANSPARENCY;
+			case NotationPackage.FILL_STYLE__GRADIENT:
+				return NotationPackage.SHAPE__GRADIENT;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == LineStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.LINE_STYLE__LINE_COLOR: return NotationPackage.SHAPE__LINE_COLOR;
-				case NotationPackage.LINE_STYLE__LINE_WIDTH: return NotationPackage.SHAPE__LINE_WIDTH;
-				default: return -1;
+			case NotationPackage.LINE_STYLE__LINE_COLOR:
+				return NotationPackage.SHAPE__LINE_COLOR;
+			case NotationPackage.LINE_STYLE__LINE_WIDTH:
+				return NotationPackage.SHAPE__LINE_WIDTH;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == RoundedCornersStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS: return NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS;
-				default: return -1;
+			case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+				return NotationPackage.SHAPE__ROUNDED_BENDPOINTS_RADIUS;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == ShapeStyle.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fontColor: "); //$NON-NLS-1$
@@ -1127,4 +1208,4 @@
 		return result.toString();
 	}
 
-} //ShapeImpl
+} // ShapeImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ShapeStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ShapeStyleImpl.java
index 2c5438b..5b337db 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ShapeStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ShapeStyleImpl.java
@@ -24,21 +24,27 @@
 import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Shape Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Shape
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getFillColor <em>Fill Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getTransparency <em>Transparency</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getGradient <em>Gradient</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getLineColor <em>Line Color</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getLineWidth <em>Line Width</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getRoundedBendpointsRadius <em>Rounded Bendpoints Radius</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getDescription
+ * <em>Description</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getFillColor
+ * <em>Fill Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getTransparency
+ * <em>Transparency</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getGradient
+ * <em>Gradient</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getLineColor
+ * <em>Line Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getLineWidth
+ * <em>Line Width</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl#getRoundedBendpointsRadius
+ * <em>Rounded Bendpoints Radius</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -46,11 +52,11 @@
  * @canBeSeenBy %partners
  */
 public class ShapeStyleImpl extends FontStyleImpl implements ShapeStyle {
-	
-    /**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
@@ -58,149 +64,151 @@
 	protected static final String DESCRIPTION_EDEFAULT = ""; //$NON-NLS-1$
 
 	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
 	 */
 	protected String description = DESCRIPTION_EDEFAULT;
 
-				/**
-	 * The default value of the '{@link #getFillColor() <em>Fill Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getFillColor() <em>Fill Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFillColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int FILL_COLOR_EDEFAULT = 16777215;
 
-    /**
-	 * The cached value of the '{@link #getFillColor() <em>Fill Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getFillColor() <em>Fill Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFillColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected int fillColor = FILL_COLOR_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getTransparency() <em>Transparency</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getTransparency() <em>Transparency</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTransparency()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int TRANSPARENCY_EDEFAULT = -1;
 
-				/**
-	 * The cached value of the '{@link #getTransparency() <em>Transparency</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getTransparency() <em>Transparency</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTransparency()
 	 * @generated
 	 * @ordered
 	 */
 	protected int transparency = TRANSPARENCY_EDEFAULT;
 
-				/**
-	 * The default value of the '{@link #getGradient() <em>Gradient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getGradient() <em>Gradient</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGradient()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final GradientData GRADIENT_EDEFAULT = null;
 
-				/**
+	/**
 	 * The cached value of the '{@link #getGradient() <em>Gradient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGradient()
 	 * @generated
 	 * @ordered
 	 */
 	protected GradientData gradient = GRADIENT_EDEFAULT;
 
-				/**
-	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int LINE_COLOR_EDEFAULT = 11579568;
 
-    /**
-	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getLineColor() <em>Line Color</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineColor()
 	 * @generated
 	 * @ordered
 	 */
 	protected int lineColor = LINE_COLOR_EDEFAULT;
 
-    /**
-	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int LINE_WIDTH_EDEFAULT = -1;
 
-				/**
-	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLineWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected int lineWidth = LINE_WIDTH_EDEFAULT;
 
-				/**
-	 * The default value of the '{@link #getRoundedBendpointsRadius() <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getRoundedBendpointsRadius() <em>Rounded
+	 * Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 * @ordered
-     * @since 1.4
+	 * @since 1.4
 	 */
 	protected static final int ROUNDED_BENDPOINTS_RADIUS_EDEFAULT = 0;
 
-				/**
-	 * The cached value of the '{@link #getRoundedBendpointsRadius() <em>Rounded Bendpoints Radius</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getRoundedBendpointsRadius() <em>Rounded
+	 * Bendpoints Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getRoundedBendpointsRadius()
 	 * @generated
 	 * @ordered
-     * @since 1.4
+	 * @since 1.4
 	 */
 	protected int roundedBendpointsRadius = ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ShapeStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -208,438 +216,465 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setFontName(String newFontName) {
 		setFontNameGen(newFontName == null ? null : newFontName.intern());
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public void setFontNameGen(String newFontName) {
 		String oldFontName = fontName;
 		fontName = newFontName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__FONT_NAME, oldFontName, fontName));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__FONT_NAME, oldFontName,
+					fontName));
 	}
-	
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDescription() {
 		return description;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDescription(String newDescription) {
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__DESCRIPTION,
+					oldDescription, description));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getFillColor() {
 		return fillColor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFillColor(int newFillColor) {
 		int oldFillColor = fillColor;
 		fillColor = newFillColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__FILL_COLOR, oldFillColor, fillColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__FILL_COLOR, oldFillColor,
+					fillColor));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getTransparency() {
 		return transparency;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTransparency(int newTransparency) {
 		int oldTransparency = transparency;
 		transparency = newTransparency;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__TRANSPARENCY, oldTransparency, transparency));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__TRANSPARENCY,
+					oldTransparency, transparency));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GradientData getGradient() {
 		return gradient;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGradient(GradientData newGradient) {
 		GradientData oldGradient = gradient;
 		gradient = newGradient;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__GRADIENT, oldGradient, gradient));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__GRADIENT, oldGradient,
+					gradient));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineColor() {
 		return lineColor;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineColor(int newLineColor) {
 		int oldLineColor = lineColor;
 		lineColor = newLineColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__LINE_COLOR, oldLineColor, lineColor));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__LINE_COLOR, oldLineColor,
+					lineColor));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getLineWidth() {
 		return lineWidth;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLineWidth(int newLineWidth) {
 		int oldLineWidth = lineWidth;
 		lineWidth = newLineWidth;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__LINE_WIDTH, oldLineWidth, lineWidth));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__LINE_WIDTH, oldLineWidth,
+					lineWidth));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public int getRoundedBendpointsRadius() {
 		return roundedBendpointsRadius;
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public void setRoundedBendpointsRadius(int newRoundedBendpointsRadius) {
 		int oldRoundedBendpointsRadius = roundedBendpointsRadius;
 		roundedBendpointsRadius = newRoundedBendpointsRadius;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS, oldRoundedBendpointsRadius, roundedBendpointsRadius));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS, oldRoundedBendpointsRadius,
+					roundedBendpointsRadius));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.SHAPE_STYLE__FONT_COLOR:
-				return new Integer(getFontColor());
-			case NotationPackage.SHAPE_STYLE__FONT_NAME:
-				return getFontName();
-			case NotationPackage.SHAPE_STYLE__FONT_HEIGHT:
-				return new Integer(getFontHeight());
-			case NotationPackage.SHAPE_STYLE__BOLD:
-				return isBold() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE_STYLE__ITALIC:
-				return isItalic() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE_STYLE__UNDERLINE:
-				return isUnderline() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE_STYLE__STRIKE_THROUGH:
-				return isStrikeThrough() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.SHAPE_STYLE__DESCRIPTION:
-				return getDescription();
-			case NotationPackage.SHAPE_STYLE__FILL_COLOR:
-				return new Integer(getFillColor());
-			case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
-				return new Integer(getTransparency());
-			case NotationPackage.SHAPE_STYLE__GRADIENT:
-				return getGradient();
-			case NotationPackage.SHAPE_STYLE__LINE_COLOR:
-				return new Integer(getLineColor());
-			case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
-				return new Integer(getLineWidth());
-			case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				return new Integer(getRoundedBendpointsRadius());
+		case NotationPackage.SHAPE_STYLE__FONT_COLOR:
+			return new Integer(getFontColor());
+		case NotationPackage.SHAPE_STYLE__FONT_NAME:
+			return getFontName();
+		case NotationPackage.SHAPE_STYLE__FONT_HEIGHT:
+			return new Integer(getFontHeight());
+		case NotationPackage.SHAPE_STYLE__BOLD:
+			return isBold() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE_STYLE__ITALIC:
+			return isItalic() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE_STYLE__UNDERLINE:
+			return isUnderline() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE_STYLE__STRIKE_THROUGH:
+			return isStrikeThrough() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.SHAPE_STYLE__DESCRIPTION:
+			return getDescription();
+		case NotationPackage.SHAPE_STYLE__FILL_COLOR:
+			return new Integer(getFillColor());
+		case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
+			return new Integer(getTransparency());
+		case NotationPackage.SHAPE_STYLE__GRADIENT:
+			return getGradient();
+		case NotationPackage.SHAPE_STYLE__LINE_COLOR:
+			return new Integer(getLineColor());
+		case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
+			return new Integer(getLineWidth());
+		case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			return new Integer(getRoundedBendpointsRadius());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.SHAPE_STYLE__FONT_COLOR:
-				setFontColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__FONT_NAME:
-				setFontName((String)newValue);
-				return;
-			case NotationPackage.SHAPE_STYLE__FONT_HEIGHT:
-				setFontHeight(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__BOLD:
-				setBold(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__ITALIC:
-				setItalic(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__UNDERLINE:
-				setUnderline(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__STRIKE_THROUGH:
-				setStrikeThrough(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case NotationPackage.SHAPE_STYLE__FILL_COLOR:
-				setFillColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
-				setTransparency(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__GRADIENT:
-				setGradient((GradientData)newValue);
-				return;
-			case NotationPackage.SHAPE_STYLE__LINE_COLOR:
-				setLineColor(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
-				setLineWidth(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.SHAPE_STYLE__FONT_COLOR:
+			setFontColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__FONT_NAME:
+			setFontName((String) newValue);
+			return;
+		case NotationPackage.SHAPE_STYLE__FONT_HEIGHT:
+			setFontHeight(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__BOLD:
+			setBold(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__ITALIC:
+			setItalic(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__UNDERLINE:
+			setUnderline(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__STRIKE_THROUGH:
+			setStrikeThrough(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
+		case NotationPackage.SHAPE_STYLE__FILL_COLOR:
+			setFillColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
+			setTransparency(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__GRADIENT:
+			setGradient((GradientData) newValue);
+			return;
+		case NotationPackage.SHAPE_STYLE__LINE_COLOR:
+			setLineColor(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
+			setLineWidth(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SHAPE_STYLE__FONT_COLOR:
-				setFontColor(FONT_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__FONT_NAME:
-				setFontName(FONT_NAME_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__FONT_HEIGHT:
-				setFontHeight(FONT_HEIGHT_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__BOLD:
-				setBold(BOLD_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__ITALIC:
-				setItalic(ITALIC_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__UNDERLINE:
-				setUnderline(UNDERLINE_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__STRIKE_THROUGH:
-				setStrikeThrough(STRIKE_THROUGH_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__FILL_COLOR:
-				setFillColor(FILL_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
-				setTransparency(TRANSPARENCY_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__GRADIENT:
-				setGradient(GRADIENT_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__LINE_COLOR:
-				setLineColor(LINE_COLOR_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
-				setLineWidth(LINE_WIDTH_EDEFAULT);
-				return;
-			case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
-				return;
+		case NotationPackage.SHAPE_STYLE__FONT_COLOR:
+			setFontColor(FONT_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__FONT_NAME:
+			setFontName(FONT_NAME_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__FONT_HEIGHT:
+			setFontHeight(FONT_HEIGHT_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__BOLD:
+			setBold(BOLD_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__ITALIC:
+			setItalic(ITALIC_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__UNDERLINE:
+			setUnderline(UNDERLINE_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__STRIKE_THROUGH:
+			setStrikeThrough(STRIKE_THROUGH_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__FILL_COLOR:
+			setFillColor(FILL_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
+			setTransparency(TRANSPARENCY_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__GRADIENT:
+			setGradient(GRADIENT_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__LINE_COLOR:
+			setLineColor(LINE_COLOR_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
+			setLineWidth(LINE_WIDTH_EDEFAULT);
+			return;
+		case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			setRoundedBendpointsRadius(ROUNDED_BENDPOINTS_RADIUS_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SHAPE_STYLE__FONT_COLOR:
-				return fontColor != FONT_COLOR_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__FONT_NAME:
-				return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
-			case NotationPackage.SHAPE_STYLE__FONT_HEIGHT:
-				return fontHeight != FONT_HEIGHT_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__BOLD:
-				return ((eFlags & BOLD_EFLAG) != 0) != BOLD_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__ITALIC:
-				return ((eFlags & ITALIC_EFLAG) != 0) != ITALIC_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__UNDERLINE:
-				return ((eFlags & UNDERLINE_EFLAG) != 0) != UNDERLINE_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__STRIKE_THROUGH:
-				return ((eFlags & STRIKE_THROUGH_EFLAG) != 0) != STRIKE_THROUGH_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case NotationPackage.SHAPE_STYLE__FILL_COLOR:
-				return fillColor != FILL_COLOR_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
-				return transparency != TRANSPARENCY_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__GRADIENT:
-				return GRADIENT_EDEFAULT == null ? gradient != null : !GRADIENT_EDEFAULT.equals(gradient);
-			case NotationPackage.SHAPE_STYLE__LINE_COLOR:
-				return lineColor != LINE_COLOR_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
-				return lineWidth != LINE_WIDTH_EDEFAULT;
-			case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
-				return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__FONT_COLOR:
+			return fontColor != FONT_COLOR_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__FONT_NAME:
+			return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
+		case NotationPackage.SHAPE_STYLE__FONT_HEIGHT:
+			return fontHeight != FONT_HEIGHT_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__BOLD:
+			return ((eFlags & BOLD_EFLAG) != 0) != BOLD_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__ITALIC:
+			return ((eFlags & ITALIC_EFLAG) != 0) != ITALIC_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__UNDERLINE:
+			return ((eFlags & UNDERLINE_EFLAG) != 0) != UNDERLINE_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__STRIKE_THROUGH:
+			return ((eFlags & STRIKE_THROUGH_EFLAG) != 0) != STRIKE_THROUGH_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case NotationPackage.SHAPE_STYLE__FILL_COLOR:
+			return fillColor != FILL_COLOR_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
+			return transparency != TRANSPARENCY_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__GRADIENT:
+			return GRADIENT_EDEFAULT == null ? gradient != null : !GRADIENT_EDEFAULT.equals(gradient);
+		case NotationPackage.SHAPE_STYLE__LINE_COLOR:
+			return lineColor != LINE_COLOR_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
+			return lineWidth != LINE_WIDTH_EDEFAULT;
+		case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+			return roundedBendpointsRadius != ROUNDED_BENDPOINTS_RADIUS_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == DescriptionStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE_STYLE__DESCRIPTION: return NotationPackage.DESCRIPTION_STYLE__DESCRIPTION;
-				default: return -1;
+			case NotationPackage.SHAPE_STYLE__DESCRIPTION:
+				return NotationPackage.DESCRIPTION_STYLE__DESCRIPTION;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FillStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE_STYLE__FILL_COLOR: return NotationPackage.FILL_STYLE__FILL_COLOR;
-				case NotationPackage.SHAPE_STYLE__TRANSPARENCY: return NotationPackage.FILL_STYLE__TRANSPARENCY;
-				case NotationPackage.SHAPE_STYLE__GRADIENT: return NotationPackage.FILL_STYLE__GRADIENT;
-				default: return -1;
+			case NotationPackage.SHAPE_STYLE__FILL_COLOR:
+				return NotationPackage.FILL_STYLE__FILL_COLOR;
+			case NotationPackage.SHAPE_STYLE__TRANSPARENCY:
+				return NotationPackage.FILL_STYLE__TRANSPARENCY;
+			case NotationPackage.SHAPE_STYLE__GRADIENT:
+				return NotationPackage.FILL_STYLE__GRADIENT;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == LineStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE_STYLE__LINE_COLOR: return NotationPackage.LINE_STYLE__LINE_COLOR;
-				case NotationPackage.SHAPE_STYLE__LINE_WIDTH: return NotationPackage.LINE_STYLE__LINE_WIDTH;
-				default: return -1;
+			case NotationPackage.SHAPE_STYLE__LINE_COLOR:
+				return NotationPackage.LINE_STYLE__LINE_COLOR;
+			case NotationPackage.SHAPE_STYLE__LINE_WIDTH:
+				return NotationPackage.LINE_STYLE__LINE_WIDTH;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == RoundedCornersStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS: return NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS;
-				default: return -1;
+			case NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+				return NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == DescriptionStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION: return NotationPackage.SHAPE_STYLE__DESCRIPTION;
-				default: return -1;
+			case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
+				return NotationPackage.SHAPE_STYLE__DESCRIPTION;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == FillStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.FILL_STYLE__FILL_COLOR: return NotationPackage.SHAPE_STYLE__FILL_COLOR;
-				case NotationPackage.FILL_STYLE__TRANSPARENCY: return NotationPackage.SHAPE_STYLE__TRANSPARENCY;
-				case NotationPackage.FILL_STYLE__GRADIENT: return NotationPackage.SHAPE_STYLE__GRADIENT;
-				default: return -1;
+			case NotationPackage.FILL_STYLE__FILL_COLOR:
+				return NotationPackage.SHAPE_STYLE__FILL_COLOR;
+			case NotationPackage.FILL_STYLE__TRANSPARENCY:
+				return NotationPackage.SHAPE_STYLE__TRANSPARENCY;
+			case NotationPackage.FILL_STYLE__GRADIENT:
+				return NotationPackage.SHAPE_STYLE__GRADIENT;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == LineStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.LINE_STYLE__LINE_COLOR: return NotationPackage.SHAPE_STYLE__LINE_COLOR;
-				case NotationPackage.LINE_STYLE__LINE_WIDTH: return NotationPackage.SHAPE_STYLE__LINE_WIDTH;
-				default: return -1;
+			case NotationPackage.LINE_STYLE__LINE_COLOR:
+				return NotationPackage.SHAPE_STYLE__LINE_COLOR;
+			case NotationPackage.LINE_STYLE__LINE_WIDTH:
+				return NotationPackage.SHAPE_STYLE__LINE_WIDTH;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == RoundedCornersStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS: return NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS;
-				default: return -1;
+			case NotationPackage.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS:
+				return NotationPackage.SHAPE_STYLE__ROUNDED_BENDPOINTS_RADIUS;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (description: "); //$NON-NLS-1$
@@ -660,4 +695,4 @@
 		return result.toString();
 	}
 
-} //ShapeStyleImpl
+} // ShapeStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SingleValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SingleValueStyleImpl.java
index c7124b8..c33f9e3 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SingleValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SingleValueStyleImpl.java
@@ -19,23 +19,23 @@
 import org.eclipse.gmf.runtime.notation.SingleValueStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Single Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Single
+ * Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl#getRawValue <em>Raw Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl#getRawValue
+ * <em>Raw Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class SingleValueStyleImpl extends DataTypeStyleImpl implements SingleValueStyle {
 	/**
-	 * The default value of the '{@link #getRawValue() <em>Raw Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRawValue() <em>Raw Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRawValue()
 	 * @generated
 	 * @ordered
@@ -43,9 +43,9 @@
 	protected static final String RAW_VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getRawValue() <em>Raw Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRawValue() <em>Raw Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRawValue()
 	 * @generated
 	 * @ordered
@@ -53,8 +53,8 @@
 	protected String rawValue = RAW_VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SingleValueStyleImpl() {
@@ -62,8 +62,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -71,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getRawValue() {
@@ -80,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setRawValue(String newRawValue) {
@@ -98,20 +98,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRawValueGen(String newRawValue) {
 		String oldRawValue = rawValue;
 		rawValue = newRawValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE, oldRawValue, rawValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE,
+					oldRawValue, rawValue));
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public Object getValue() {
@@ -119,8 +120,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setValue(Object newValue) {
@@ -128,87 +129,89 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.SINGLE_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.SINGLE_VALUE_STYLE__INSTANCE_TYPE:
-				if (resolve) return getInstanceType();
-				return basicGetInstanceType();
-			case NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE:
-				return getRawValue();
+		case NotationPackage.SINGLE_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.SINGLE_VALUE_STYLE__INSTANCE_TYPE:
+			if (resolve)
+				return getInstanceType();
+			return basicGetInstanceType();
+		case NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE:
+			return getRawValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.SINGLE_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.SINGLE_VALUE_STYLE__INSTANCE_TYPE:
-				setInstanceType((EDataType)newValue);
-				return;
-			case NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE:
-				setRawValue((String)newValue);
-				return;
+		case NotationPackage.SINGLE_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.SINGLE_VALUE_STYLE__INSTANCE_TYPE:
+			setInstanceType((EDataType) newValue);
+			return;
+		case NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE:
+			setRawValue((String) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SINGLE_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.SINGLE_VALUE_STYLE__INSTANCE_TYPE:
-				setInstanceType((EDataType)null);
-				return;
-			case NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE:
-				setRawValue(RAW_VALUE_EDEFAULT);
-				return;
+		case NotationPackage.SINGLE_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.SINGLE_VALUE_STYLE__INSTANCE_TYPE:
+			setInstanceType((EDataType) null);
+			return;
+		case NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE:
+			setRawValue(RAW_VALUE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SINGLE_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.SINGLE_VALUE_STYLE__INSTANCE_TYPE:
-				return instanceType != null;
-			case NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE:
-				return RAW_VALUE_EDEFAULT == null ? rawValue != null : !RAW_VALUE_EDEFAULT.equals(rawValue);
+		case NotationPackage.SINGLE_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.SINGLE_VALUE_STYLE__INSTANCE_TYPE:
+			return instanceType != null;
+		case NotationPackage.SINGLE_VALUE_STYLE__RAW_VALUE:
+			return RAW_VALUE_EDEFAULT == null ? rawValue != null : !RAW_VALUE_EDEFAULT.equals(rawValue);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (rawValue: "); //$NON-NLS-1$
@@ -217,4 +220,4 @@
 		return result.toString();
 	}
 
-} //SingleValueStyleImpl
+} // SingleValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SizeImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SizeImpl.java
index eeda3fa..db1c240 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SizeImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SizeImpl.java
@@ -20,16 +20,17 @@
 import org.eclipse.gmf.runtime.notation.Size;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Size</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Size</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SizeImpl#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SizeImpl#getHeight <em>Height</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SizeImpl#getWidth
+ * <em>Width</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SizeImpl#getHeight
+ * <em>Height</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -37,76 +38,76 @@
  * @canBeSeenBy %partners
  */
 public class SizeImpl extends MinimalEObjectImpl.Container implements Size {
-    /**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int WIDTH_EDEFAULT = -1;
 
-    /**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected int width = WIDTH_EDEFAULT;
 
-    /**
+	/**
 	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int HEIGHT_EDEFAULT = -1;
 
-    /**
+	/**
 	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected int height = HEIGHT_EDEFAULT;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SizeImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.SIZE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getWidth() {
 		return width;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(int newWidth) {
@@ -116,18 +117,18 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SIZE__WIDTH, oldWidth, width));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getHeight() {
 		return height;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHeight(int newHeight) {
@@ -137,77 +138,78 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SIZE__HEIGHT, oldHeight, height));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.SIZE__WIDTH:
-				return new Integer(getWidth());
-			case NotationPackage.SIZE__HEIGHT:
-				return new Integer(getHeight());
+		case NotationPackage.SIZE__WIDTH:
+			return new Integer(getWidth());
+		case NotationPackage.SIZE__HEIGHT:
+			return new Integer(getHeight());
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.SIZE__WIDTH:
-				setWidth(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.SIZE__HEIGHT:
-				setHeight(((Integer)newValue).intValue());
-				return;
+		case NotationPackage.SIZE__WIDTH:
+			setWidth(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.SIZE__HEIGHT:
+			setHeight(((Integer) newValue).intValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SIZE__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
-			case NotationPackage.SIZE__HEIGHT:
-				setHeight(HEIGHT_EDEFAULT);
-				return;
+		case NotationPackage.SIZE__WIDTH:
+			setWidth(WIDTH_EDEFAULT);
+			return;
+		case NotationPackage.SIZE__HEIGHT:
+			setHeight(HEIGHT_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SIZE__WIDTH:
-				return width != WIDTH_EDEFAULT;
-			case NotationPackage.SIZE__HEIGHT:
-				return height != HEIGHT_EDEFAULT;
+		case NotationPackage.SIZE__WIDTH:
+			return width != WIDTH_EDEFAULT;
+		case NotationPackage.SIZE__HEIGHT:
+			return height != HEIGHT_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (width: "); //$NON-NLS-1$
@@ -218,4 +220,4 @@
 		return result.toString();
 	}
 
-} //SizeImpl
+} // SizeImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SortingStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SortingStyleImpl.java
index 139db0a..285c6f5 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SortingStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/SortingStyleImpl.java
@@ -31,17 +31,19 @@
 import org.eclipse.gmf.runtime.notation.SortingStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Sorting Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sorting
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl#getSorting <em>Sorting</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl#getSortingKeys <em>Sorting Keys</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl#getSortedObjects <em>Sorted Objects</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl#getSorting
+ * <em>Sorting</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl#getSortingKeys
+ * <em>Sorting Keys</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl#getSortedObjects
+ * <em>Sorted Objects</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -49,133 +51,137 @@
  * @canBeSeenBy %partners
  */
 public class SortingStyleImpl extends MinimalEObjectImpl.Container implements SortingStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
-    /**
+
+	/**
 	 * The default value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSorting()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final Sorting SORTING_EDEFAULT = Sorting.NONE_LITERAL;
 
-    /**
-	 * The offset of the flags representing the value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The offset of the flags representing the value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SORTING_EFLAG_OFFSET = 8;
 
-				/**
-	 * The flags representing the default value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the default value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SORTING_EFLAG_DEFAULT = Sorting.VALUES.indexOf(SORTING_EDEFAULT) << SORTING_EFLAG_OFFSET;
 
-				/**
-	 * The array of enumeration values for '{@link Sorting Sorting}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The array of enumeration values for '{@link Sorting Sorting}' <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final Sorting[] SORTING_EFLAG_VALUES = (Sorting[])Sorting.VALUES.toArray(new Sorting[Sorting.VALUES.size()]);
+	private static final Sorting[] SORTING_EFLAG_VALUES = (Sorting[]) Sorting.VALUES
+			.toArray(new Sorting[Sorting.VALUES.size()]);
 
-				/**
-	 * The flags representing the value of the '{@link #getSorting() <em>Sorting</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flags representing the value of the '{@link #getSorting()
+	 * <em>Sorting</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSorting()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SORTING_EFLAG = 0x3 << SORTING_EFLAG_OFFSET;
 
-				/**
-	 * The default value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortingKeys()
 	 * @generated NOT
 	 * @ordered
 	 */
 	protected static final Map SORTING_KEYS_EDEFAULT = Collections.EMPTY_MAP;
 
-    /**
-	 * The cached value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getSortingKeys() <em>Sorting Keys</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortingKeys()
 	 * @generated
 	 * @ordered
 	 */
 	protected Map sortingKeys = SORTING_KEYS_EDEFAULT;
 
-    /**
-	 * The cached value of the '{@link #getSortedObjects() <em>Sorted Objects</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getSortedObjects() <em>Sorted Objects</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSortedObjects()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList sortedObjects;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SortingStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.SORTING_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Sorting getSorting() {
 		return SORTING_EFLAG_VALUES[(eFlags & SORTING_EFLAG) >>> SORTING_EFLAG_OFFSET];
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSorting(Sorting newSorting) {
 		Sorting oldSorting = SORTING_EFLAG_VALUES[(eFlags & SORTING_EFLAG) >>> SORTING_EFLAG_OFFSET];
-		if (newSorting == null) newSorting = SORTING_EDEFAULT;
+		if (newSorting == null)
+			newSorting = SORTING_EDEFAULT;
 		eFlags = eFlags & ~SORTING_EFLAG | Sorting.VALUES.indexOf(newSorting) << SORTING_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SORTING_STYLE__SORTING, oldSorting, newSorting));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SORTING_STYLE__SORTING, oldSorting,
+					newSorting));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public Map getSortingKeys() {
@@ -183,21 +189,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Map getSortingKeysGen() {
 		return sortingKeys;
 	}
-	
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public void setSortingKeys(Map newSortingKeys) {
-		if (newSortingKeys == null )
+		if (newSortingKeys == null)
 			throw new NullPointerException("the 'newSortingKeys' parameter is null"); //$NON-NLS-1$
 
 		if (newSortingKeys.isEmpty())
@@ -210,7 +216,8 @@
 					throw new IllegalArgumentException("One or more keys in the map is not of type java.lang.String"); //$NON-NLS-1$
 				Object value = newSortingKeys.get(key);
 				if (!(value instanceof SortingDirection))
-					throw new IllegalArgumentException("One or more values in the map is not of type org.eclipse.gmf.runtime.notation.SortingDirection"); //$NON-NLS-1$
+					throw new IllegalArgumentException(
+							"One or more values in the map is not of type org.eclipse.gmf.runtime.notation.SortingDirection"); //$NON-NLS-1$
 				tempMap.put(key, value);
 			}
 			setSortingKeysGen(tempMap);
@@ -218,111 +225,114 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSortingKeysGen(Map newSortingKeys) {
 		Map oldSortingKeys = sortingKeys;
 		sortingKeys = newSortingKeys;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SORTING_STYLE__SORTING_KEYS, oldSortingKeys, sortingKeys));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.SORTING_STYLE__SORTING_KEYS,
+					oldSortingKeys, sortingKeys));
 	}
-	
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getSortedObjects() {
 		if (sortedObjects == null) {
-			sortedObjects = new EObjectResolvingEList(EObject.class, this, NotationPackage.SORTING_STYLE__SORTED_OBJECTS);
+			sortedObjects = new EObjectResolvingEList(EObject.class, this,
+					NotationPackage.SORTING_STYLE__SORTED_OBJECTS);
 		}
 		return sortedObjects;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.SORTING_STYLE__SORTING:
-				return getSorting();
-			case NotationPackage.SORTING_STYLE__SORTING_KEYS:
-				return getSortingKeys();
-			case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
-				return getSortedObjects();
+		case NotationPackage.SORTING_STYLE__SORTING:
+			return getSorting();
+		case NotationPackage.SORTING_STYLE__SORTING_KEYS:
+			return getSortingKeys();
+		case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
+			return getSortedObjects();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.SORTING_STYLE__SORTING:
-				setSorting((Sorting)newValue);
-				return;
-			case NotationPackage.SORTING_STYLE__SORTING_KEYS:
-				setSortingKeys((Map)newValue);
-				return;
-			case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
-				getSortedObjects().clear();
-				getSortedObjects().addAll((Collection)newValue);
-				return;
+		case NotationPackage.SORTING_STYLE__SORTING:
+			setSorting((Sorting) newValue);
+			return;
+		case NotationPackage.SORTING_STYLE__SORTING_KEYS:
+			setSortingKeys((Map) newValue);
+			return;
+		case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
+			getSortedObjects().clear();
+			getSortedObjects().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SORTING_STYLE__SORTING:
-				setSorting(SORTING_EDEFAULT);
-				return;
-			case NotationPackage.SORTING_STYLE__SORTING_KEYS:
-				setSortingKeys(SORTING_KEYS_EDEFAULT);
-				return;
-			case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
-				getSortedObjects().clear();
-				return;
+		case NotationPackage.SORTING_STYLE__SORTING:
+			setSorting(SORTING_EDEFAULT);
+			return;
+		case NotationPackage.SORTING_STYLE__SORTING_KEYS:
+			setSortingKeys(SORTING_KEYS_EDEFAULT);
+			return;
+		case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
+			getSortedObjects().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.SORTING_STYLE__SORTING:
-				return (eFlags & SORTING_EFLAG) != SORTING_EFLAG_DEFAULT;
-			case NotationPackage.SORTING_STYLE__SORTING_KEYS:
-				return SORTING_KEYS_EDEFAULT == null ? sortingKeys != null : !SORTING_KEYS_EDEFAULT.equals(sortingKeys);
-			case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
-				return sortedObjects != null && !sortedObjects.isEmpty();
+		case NotationPackage.SORTING_STYLE__SORTING:
+			return (eFlags & SORTING_EFLAG) != SORTING_EFLAG_DEFAULT;
+		case NotationPackage.SORTING_STYLE__SORTING_KEYS:
+			return SORTING_KEYS_EDEFAULT == null ? sortingKeys != null : !SORTING_KEYS_EDEFAULT.equals(sortingKeys);
+		case NotationPackage.SORTING_STYLE__SORTED_OBJECTS:
+			return sortedObjects != null && !sortedObjects.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (sorting: "); //$NON-NLS-1$
@@ -333,4 +343,4 @@
 		return result.toString();
 	}
 
-} //SortingStyleImpl
+} // SortingStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StandardDiagramImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StandardDiagramImpl.java
index ec2db65..cb635c4 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StandardDiagramImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StandardDiagramImpl.java
@@ -33,21 +33,27 @@
 import org.eclipse.gmf.runtime.notation.Style;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Standard Diagram</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>Standard Diagram</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getPageX <em>Page X</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getPageY <em>Page Y</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getPageWidth <em>Page Width</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getPageHeight <em>Page Height</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getHorizontalGuides <em>Horizontal Guides</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getVerticalGuides <em>Vertical Guides</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getDescription <em>Description</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getPageX
+ * <em>Page X</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getPageY
+ * <em>Page Y</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getPageWidth
+ * <em>Page Width</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getPageHeight
+ * <em>Page Height</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getHorizontalGuides
+ * <em>Horizontal Guides</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getVerticalGuides
+ * <em>Vertical Guides</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl#getDescription
+ * <em>Description</em>}</li>
+ * </ul>
  *
  * @generated
  * @since 1.2
@@ -55,17 +61,17 @@
 public class StandardDiagramImpl extends DiagramImpl implements StandardDiagram {
 	/**
 	 * The default value of the '{@link #getPageX() <em>Page X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageX()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int PAGE_X_EDEFAULT = 0;
 	/**
-	 * The cached value of the '{@link #getPageX() <em>Page X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPageX() <em>Page X</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageX()
 	 * @generated
 	 * @ordered
@@ -73,97 +79,100 @@
 	protected int pageX = PAGE_X_EDEFAULT;
 	/**
 	 * The default value of the '{@link #getPageY() <em>Page Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageY()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int PAGE_Y_EDEFAULT = 0;
 	/**
-	 * The cached value of the '{@link #getPageY() <em>Page Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPageY() <em>Page Y</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageY()
 	 * @generated
 	 * @ordered
 	 */
 	protected int pageY = PAGE_Y_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getPageWidth() <em>Page Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getPageWidth() <em>Page Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int PAGE_WIDTH_EDEFAULT = 100;
 	/**
-	 * The cached value of the '{@link #getPageWidth() <em>Page Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPageWidth() <em>Page Width</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageWidth()
 	 * @generated
 	 * @ordered
 	 */
 	protected int pageWidth = PAGE_WIDTH_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getPageHeight() <em>Page Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getPageHeight() <em>Page Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int PAGE_HEIGHT_EDEFAULT = 100;
 	/**
-	 * The cached value of the '{@link #getPageHeight() <em>Page Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPageHeight() <em>Page Height</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPageHeight()
 	 * @generated
 	 * @ordered
 	 */
 	protected int pageHeight = PAGE_HEIGHT_EDEFAULT;
 	/**
-	 * The cached value of the '{@link #getHorizontalGuides() <em>Horizontal Guides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHorizontalGuides() <em>Horizontal
+	 * Guides</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHorizontalGuides()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList horizontalGuides;
 	/**
-	 * The cached value of the '{@link #getVerticalGuides() <em>Vertical Guides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getVerticalGuides() <em>Vertical
+	 * Guides</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getVerticalGuides()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList verticalGuides;
 	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final String DESCRIPTION_EDEFAULT = ""; //$NON-NLS-1$
 	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDescription()
 	 * @generated
 	 * @ordered
 	 */
 	protected String description = DESCRIPTION_EDEFAULT;
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StandardDiagramImpl() {
@@ -171,8 +180,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -180,8 +189,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPageX() {
@@ -189,20 +198,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPageX(int newPageX) {
 		int oldPageX = pageX;
 		pageX = newPageX;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__PAGE_X, oldPageX, pageX));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__PAGE_X, oldPageX,
+					pageX));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPageY() {
@@ -210,20 +220,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPageY(int newPageY) {
 		int oldPageY = pageY;
 		pageY = newPageY;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__PAGE_Y, oldPageY, pageY));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__PAGE_Y, oldPageY,
+					pageY));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPageWidth() {
@@ -231,20 +242,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPageWidth(int newPageWidth) {
 		int oldPageWidth = pageWidth;
 		pageWidth = newPageWidth;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH, oldPageWidth, pageWidth));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH,
+					oldPageWidth, pageWidth));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPageHeight() {
@@ -252,44 +264,47 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPageHeight(int newPageHeight) {
 		int oldPageHeight = pageHeight;
 		pageHeight = newPageHeight;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT, oldPageHeight, pageHeight));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT,
+					oldPageHeight, pageHeight));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getHorizontalGuides() {
 		if (horizontalGuides == null) {
-			horizontalGuides = new EObjectContainmentEList(Guide.class, this, NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES);
+			horizontalGuides = new EObjectContainmentEList(Guide.class, this,
+					NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES);
 		}
 		return horizontalGuides;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getVerticalGuides() {
 		if (verticalGuides == null) {
-			verticalGuides = new EObjectContainmentEList(Guide.class, this, NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES);
+			verticalGuides = new EObjectContainmentEList(Guide.class, this,
+					NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES);
 		}
 		return verticalGuides;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDescription() {
@@ -297,407 +312,435 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDescription(String newDescription) {
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STANDARD_DIAGRAM__DESCRIPTION,
+					oldDescription, description));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
-				return ((InternalEList)getSourceEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
-				return ((InternalEList)getTargetEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
-				return ((InternalEList)getPersistedChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__STYLES:
-				return ((InternalEList)getStyles()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
-				return ((InternalEList)getTransientChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
-				return ((InternalEList)getPersistedEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
-				return ((InternalEList)getTransientEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
-				return ((InternalEList)getHorizontalGuides()).basicRemove(otherEnd, msgs);
-			case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
-				return ((InternalEList)getVerticalGuides()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
+			return ((InternalEList) getSourceEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
+			return ((InternalEList) getTargetEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
+			return ((InternalEList) getPersistedChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__STYLES:
+			return ((InternalEList) getStyles()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
+			return ((InternalEList) getTransientChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
+			return ((InternalEList) getPersistedEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
+			return ((InternalEList) getTransientEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
+			return ((InternalEList) getHorizontalGuides()).basicRemove(otherEnd, msgs);
+		case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
+			return ((InternalEList) getVerticalGuides()).basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.STANDARD_DIAGRAM__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.STANDARD_DIAGRAM__TYPE:
-				return getType();
-			case NotationPackage.STANDARD_DIAGRAM__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.STANDARD_DIAGRAM__STYLES:
-				return getStyles();
-			case NotationPackage.STANDARD_DIAGRAM__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.STANDARD_DIAGRAM__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
-				return getTransientChildren();
-			case NotationPackage.STANDARD_DIAGRAM__NAME:
-				return getName();
-			case NotationPackage.STANDARD_DIAGRAM__MEASUREMENT_UNIT:
-				return getMeasurementUnit();
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
-				return getPersistedEdges();
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
-				return getTransientEdges();
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
-				return new Integer(getPageX());
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
-				return new Integer(getPageY());
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
-				return new Integer(getPageWidth());
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
-				return new Integer(getPageHeight());
-			case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
-				return getHorizontalGuides();
-			case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
-				return getVerticalGuides();
-			case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
-				return getDescription();
+		case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.STANDARD_DIAGRAM__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.STANDARD_DIAGRAM__TYPE:
+			return getType();
+		case NotationPackage.STANDARD_DIAGRAM__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.STANDARD_DIAGRAM__STYLES:
+			return getStyles();
+		case NotationPackage.STANDARD_DIAGRAM__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.STANDARD_DIAGRAM__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
+			return getTransientChildren();
+		case NotationPackage.STANDARD_DIAGRAM__NAME:
+			return getName();
+		case NotationPackage.STANDARD_DIAGRAM__MEASUREMENT_UNIT:
+			return getMeasurementUnit();
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
+			return getPersistedEdges();
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
+			return getTransientEdges();
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
+			return new Integer(getPageX());
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
+			return new Integer(getPageY());
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
+			return new Integer(getPageWidth());
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
+			return new Integer(getPageHeight());
+		case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
+			return getHorizontalGuides();
+		case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
+			return getVerticalGuides();
+		case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
+			return getDescription();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__MEASUREMENT_UNIT:
-				setMeasurementUnit((MeasurementUnit)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
-				getPersistedEdges().clear();
-				getPersistedEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
-				getTransientEdges().clear();
-				getTransientEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
-				setPageX(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
-				setPageY(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
-				setPageWidth(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
-				setPageHeight(((Integer)newValue).intValue());
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
-				getHorizontalGuides().clear();
-				getHorizontalGuides().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
-				getVerticalGuides().clear();
-				getVerticalGuides().addAll((Collection)newValue);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
+		case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__MEASUREMENT_UNIT:
+			setMeasurementUnit((MeasurementUnit) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
+			getPersistedEdges().clear();
+			getPersistedEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
+			getTransientEdges().clear();
+			getTransientEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
+			setPageX(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
+			setPageY(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
+			setPageWidth(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
+			setPageHeight(((Integer) newValue).intValue());
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
+			getHorizontalGuides().clear();
+			getHorizontalGuides().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
+			getVerticalGuides().clear();
+			getVerticalGuides().addAll((Collection) newValue);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__MEASUREMENT_UNIT:
-				unsetMeasurementUnit();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
-				getPersistedEdges().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
-				getTransientEdges().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
-				setPageX(PAGE_X_EDEFAULT);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
-				setPageY(PAGE_Y_EDEFAULT);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
-				setPageWidth(PAGE_WIDTH_EDEFAULT);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
-				setPageHeight(PAGE_HEIGHT_EDEFAULT);
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
-				getHorizontalGuides().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
-				getVerticalGuides().clear();
-				return;
-			case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
+		case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__MEASUREMENT_UNIT:
+			unsetMeasurementUnit();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
+			getPersistedEdges().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
+			getTransientEdges().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
+			setPageX(PAGE_X_EDEFAULT);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
+			setPageY(PAGE_Y_EDEFAULT);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
+			setPageWidth(PAGE_WIDTH_EDEFAULT);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
+			setPageHeight(PAGE_HEIGHT_EDEFAULT);
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
+			getHorizontalGuides().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
+			getVerticalGuides().clear();
+			return;
+		case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.STANDARD_DIAGRAM__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.STANDARD_DIAGRAM__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
-				return sourceEdges != null && !sourceEdges.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
-				return targetEdges != null && !targetEdges.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__ELEMENT:
-				return isSetElement();
-			case NotationPackage.STANDARD_DIAGRAM__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.STANDARD_DIAGRAM__MEASUREMENT_UNIT:
-				return isSetMeasurementUnit();
-			case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
-				return persistedEdges != null && !persistedEdges.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
-				return transientEdges != null && !transientEdges.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
-				return pageX != PAGE_X_EDEFAULT;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
-				return pageY != PAGE_Y_EDEFAULT;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
-				return pageWidth != PAGE_WIDTH_EDEFAULT;
-			case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
-				return pageHeight != PAGE_HEIGHT_EDEFAULT;
-			case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
-				return horizontalGuides != null && !horizontalGuides.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
-				return verticalGuides != null && !verticalGuides.isEmpty();
-			case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case NotationPackage.STANDARD_DIAGRAM__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.STANDARD_DIAGRAM__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.STANDARD_DIAGRAM__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.STANDARD_DIAGRAM__SOURCE_EDGES:
+			return sourceEdges != null && !sourceEdges.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__TARGET_EDGES:
+			return targetEdges != null && !targetEdges.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__ELEMENT:
+			return isSetElement();
+		case NotationPackage.STANDARD_DIAGRAM__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.STANDARD_DIAGRAM__MEASUREMENT_UNIT:
+			return isSetMeasurementUnit();
+		case NotationPackage.STANDARD_DIAGRAM__PERSISTED_EDGES:
+			return persistedEdges != null && !persistedEdges.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__TRANSIENT_EDGES:
+			return transientEdges != null && !transientEdges.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
+			return pageX != PAGE_X_EDEFAULT;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
+			return pageY != PAGE_Y_EDEFAULT;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
+			return pageWidth != PAGE_WIDTH_EDEFAULT;
+		case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
+			return pageHeight != PAGE_HEIGHT_EDEFAULT;
+		case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
+			return horizontalGuides != null && !horizontalGuides.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
+			return verticalGuides != null && !verticalGuides.isEmpty();
+		case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == PageStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.STANDARD_DIAGRAM__PAGE_X: return NotationPackage.PAGE_STYLE__PAGE_X;
-				case NotationPackage.STANDARD_DIAGRAM__PAGE_Y: return NotationPackage.PAGE_STYLE__PAGE_Y;
-				case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH: return NotationPackage.PAGE_STYLE__PAGE_WIDTH;
-				case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT: return NotationPackage.PAGE_STYLE__PAGE_HEIGHT;
-				default: return -1;
+			case NotationPackage.STANDARD_DIAGRAM__PAGE_X:
+				return NotationPackage.PAGE_STYLE__PAGE_X;
+			case NotationPackage.STANDARD_DIAGRAM__PAGE_Y:
+				return NotationPackage.PAGE_STYLE__PAGE_Y;
+			case NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH:
+				return NotationPackage.PAGE_STYLE__PAGE_WIDTH;
+			case NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT:
+				return NotationPackage.PAGE_STYLE__PAGE_HEIGHT;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == GuideStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES: return NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES;
-				case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES: return NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES;
-				default: return -1;
+			case NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES:
+				return NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES;
+			case NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES:
+				return NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DescriptionStyle.class) {
 			switch (derivedFeatureID) {
-				case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION: return NotationPackage.DESCRIPTION_STYLE__DESCRIPTION;
-				default: return -1;
+			case NotationPackage.STANDARD_DIAGRAM__DESCRIPTION:
+				return NotationPackage.DESCRIPTION_STYLE__DESCRIPTION;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DiagramStyle.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
 		if (baseClass == Style.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == PageStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.PAGE_STYLE__PAGE_X: return NotationPackage.STANDARD_DIAGRAM__PAGE_X;
-				case NotationPackage.PAGE_STYLE__PAGE_Y: return NotationPackage.STANDARD_DIAGRAM__PAGE_Y;
-				case NotationPackage.PAGE_STYLE__PAGE_WIDTH: return NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH;
-				case NotationPackage.PAGE_STYLE__PAGE_HEIGHT: return NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT;
-				default: return -1;
+			case NotationPackage.PAGE_STYLE__PAGE_X:
+				return NotationPackage.STANDARD_DIAGRAM__PAGE_X;
+			case NotationPackage.PAGE_STYLE__PAGE_Y:
+				return NotationPackage.STANDARD_DIAGRAM__PAGE_Y;
+			case NotationPackage.PAGE_STYLE__PAGE_WIDTH:
+				return NotationPackage.STANDARD_DIAGRAM__PAGE_WIDTH;
+			case NotationPackage.PAGE_STYLE__PAGE_HEIGHT:
+				return NotationPackage.STANDARD_DIAGRAM__PAGE_HEIGHT;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == GuideStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES: return NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES;
-				case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES: return NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES;
-				default: return -1;
+			case NotationPackage.GUIDE_STYLE__HORIZONTAL_GUIDES:
+				return NotationPackage.STANDARD_DIAGRAM__HORIZONTAL_GUIDES;
+			case NotationPackage.GUIDE_STYLE__VERTICAL_GUIDES:
+				return NotationPackage.STANDARD_DIAGRAM__VERTICAL_GUIDES;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DescriptionStyle.class) {
 			switch (baseFeatureID) {
-				case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION: return NotationPackage.STANDARD_DIAGRAM__DESCRIPTION;
-				default: return -1;
+			case NotationPackage.DESCRIPTION_STYLE__DESCRIPTION:
+				return NotationPackage.STANDARD_DIAGRAM__DESCRIPTION;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == DiagramStyle.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (pageX: "); //$NON-NLS-1$
@@ -714,4 +757,4 @@
 		return result.toString();
 	}
 
-} //StandardDiagramImpl
+} // StandardDiagramImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringListValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringListValueStyleImpl.java
index ec49f6c..62a6980 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringListValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringListValueStyleImpl.java
@@ -20,23 +20,23 @@
 import org.eclipse.gmf.runtime.notation.StringListValueStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String List Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String
+ * List Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl#getStringListValue <em>String List Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl#getStringListValue
+ * <em>String List Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class StringListValueStyleImpl extends NamedStyleImpl implements StringListValueStyle {
 	/**
-	 * The cached value of the '{@link #getStringListValue() <em>String List Value</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStringListValue() <em>String List
+	 * Value</em>}' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStringListValue()
 	 * @generated
 	 * @ordered
@@ -44,8 +44,8 @@
 	protected EList stringListValue;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StringListValueStyleImpl() {
@@ -53,8 +53,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -62,89 +62,91 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList getStringListValue() {
 		if (stringListValue == null) {
-			stringListValue = new EDataTypeEList(String.class, this, NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);
+			stringListValue = new EDataTypeEList(String.class, this,
+					NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);
 		}
 		return stringListValue;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.STRING_LIST_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
-				return getStringListValue();
+		case NotationPackage.STRING_LIST_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+			return getStringListValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.STRING_LIST_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
-				getStringListValue().clear();
-				getStringListValue().addAll((Collection)newValue);
-				return;
+		case NotationPackage.STRING_LIST_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+			getStringListValue().clear();
+			getStringListValue().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.STRING_LIST_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
-				getStringListValue().clear();
-				return;
+		case NotationPackage.STRING_LIST_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+			getStringListValue().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.STRING_LIST_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
-				return stringListValue != null && !stringListValue.isEmpty();
+		case NotationPackage.STRING_LIST_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+			return stringListValue != null && !stringListValue.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (stringListValue: "); //$NON-NLS-1$
@@ -153,4 +155,4 @@
 		return result.toString();
 	}
 
-} //StringListValueStyleImpl
+} // StringListValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringToPropertyValueMapEntryImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringToPropertyValueMapEntryImpl.java
index b131ba9..71b8e34 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringToPropertyValueMapEntryImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringToPropertyValueMapEntryImpl.java
@@ -24,24 +24,25 @@
 import org.eclipse.gmf.runtime.notation.PropertyValue;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String To Property Value Map Entry</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String
+ * To Property Value Map Entry</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl#getTypedKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl#getTypedKey
+ * <em>Key</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl#getTypedValue
+ * <em>Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class StringToPropertyValueMapEntryImpl extends MinimalEObjectImpl.Container implements BasicEMap.Entry {
 	/**
 	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
@@ -49,9 +50,9 @@
 	protected static final String KEY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
@@ -59,9 +60,9 @@
 	protected String key = KEY_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
@@ -69,8 +70,8 @@
 	protected PropertyValue value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StringToPropertyValueMapEntryImpl() {
@@ -78,8 +79,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -87,8 +88,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTypedKey() {
@@ -96,20 +97,21 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTypedKey(String newKey) {
 		String oldKey = key;
 		key = newKey;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY, oldKey, key));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY, oldKey, key));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PropertyValue getTypedValue() {
@@ -117,123 +119,131 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTypedValue(PropertyValue newValue, NotificationChain msgs) {
 		PropertyValue oldValue = value;
 		value = newValue;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE, oldValue, newValue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE, oldValue, newValue);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTypedValue(PropertyValue newValue) {
 		if (newValue != value) {
 			NotificationChain msgs = null;
 			if (value != null)
-				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE, null, msgs);
+				msgs = ((InternalEObject) value).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE, null, msgs);
 			if (newValue != null)
-				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE, null, msgs);
+				msgs = ((InternalEObject) newValue).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE, null, msgs);
 			msgs = basicSetTypedValue(newValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE, newValue, newValue));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE, newValue, newValue));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
-				return basicSetTypedValue(null, msgs);
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
+			return basicSetTypedValue(null, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY:
-				return getTypedKey();
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
-				return getTypedValue();
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY:
+			return getTypedKey();
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
+			return getTypedValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY:
-				setTypedKey((String)newValue);
-				return;
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
-				setTypedValue((PropertyValue)newValue);
-				return;
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY:
+			setTypedKey((String) newValue);
+			return;
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
+			setTypedValue((PropertyValue) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY:
-				setTypedKey(KEY_EDEFAULT);
-				return;
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
-				setTypedValue((PropertyValue)null);
-				return;
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY:
+			setTypedKey(KEY_EDEFAULT);
+			return;
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
+			setTypedValue((PropertyValue) null);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY:
-				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
-				return value != null;
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__KEY:
+			return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY__VALUE:
+			return value != null;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (key: "); //$NON-NLS-1$
@@ -243,15 +253,15 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected int hash = -1;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getHash() {
@@ -263,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHash(int hash) {
@@ -272,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getKey() {
@@ -281,17 +291,17 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setKey(Object key) {
-		setTypedKey((String)key);
+		setTypedKey((String) key);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object getValue() {
@@ -299,24 +309,24 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object setValue(Object value) {
 		Object oldValue = getValue();
-		setTypedValue((PropertyValue)value);
+		setTypedValue((PropertyValue) value);
 		return oldValue;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EMap getEMap() {
 		EObject container = eContainer();
-		return container == null ? null : (EMap)container.eGet(eContainmentFeature());
+		return container == null ? null : (EMap) container.eGet(eContainmentFeature());
 	}
 
-} //StringToPropertyValueMapEntryImpl
+} // StringToPropertyValueMapEntryImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringValueStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringValueStyleImpl.java
index f5f8cf8..64816c3 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringValueStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/StringValueStyleImpl.java
@@ -12,32 +12,29 @@
 package org.eclipse.gmf.runtime.notation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.StringValueStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String Value Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String
+ * Value Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl#getStringValue <em>String Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl#getStringValue
+ * <em>String Value</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class StringValueStyleImpl extends NamedStyleImpl implements StringValueStyle {
 	/**
-	 * The default value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStringValue() <em>String Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStringValue()
 	 * @generated
 	 * @ordered
@@ -45,9 +42,9 @@
 	protected static final String STRING_VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStringValue() <em>String Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStringValue()
 	 * @generated
 	 * @ordered
@@ -55,8 +52,8 @@
 	protected String stringValue = STRING_VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StringValueStyleImpl() {
@@ -64,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -73,8 +70,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStringValue() {
@@ -82,88 +79,90 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStringValue(String newStringValue) {
 		String oldStringValue = stringValue;
 		stringValue = newStringValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STRING_VALUE_STYLE__STRING_VALUE, oldStringValue, stringValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.STRING_VALUE_STYLE__STRING_VALUE,
+					oldStringValue, stringValue));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.STRING_VALUE_STYLE__NAME:
-				return getName();
-			case NotationPackage.STRING_VALUE_STYLE__STRING_VALUE:
-				return getStringValue();
+		case NotationPackage.STRING_VALUE_STYLE__NAME:
+			return getName();
+		case NotationPackage.STRING_VALUE_STYLE__STRING_VALUE:
+			return getStringValue();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.STRING_VALUE_STYLE__NAME:
-				setName((String)newValue);
-				return;
-			case NotationPackage.STRING_VALUE_STYLE__STRING_VALUE:
-				setStringValue((String)newValue);
-				return;
+		case NotationPackage.STRING_VALUE_STYLE__NAME:
+			setName((String) newValue);
+			return;
+		case NotationPackage.STRING_VALUE_STYLE__STRING_VALUE:
+			setStringValue((String) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.STRING_VALUE_STYLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NotationPackage.STRING_VALUE_STYLE__STRING_VALUE:
-				setStringValue(STRING_VALUE_EDEFAULT);
-				return;
+		case NotationPackage.STRING_VALUE_STYLE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case NotationPackage.STRING_VALUE_STYLE__STRING_VALUE:
+			setStringValue(STRING_VALUE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.STRING_VALUE_STYLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NotationPackage.STRING_VALUE_STYLE__STRING_VALUE:
-				return STRING_VALUE_EDEFAULT == null ? stringValue != null : !STRING_VALUE_EDEFAULT.equals(stringValue);
+		case NotationPackage.STRING_VALUE_STYLE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case NotationPackage.STRING_VALUE_STYLE__STRING_VALUE:
+			return STRING_VALUE_EDEFAULT == null ? stringValue != null : !STRING_VALUE_EDEFAULT.equals(stringValue);
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (stringValue: "); //$NON-NLS-1$
@@ -172,4 +171,4 @@
 		return result.toString();
 	}
 
-} //StringValueStyleImpl
+} // StringValueStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/TextStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/TextStyleImpl.java
index 2b9f4bb..2c2f218 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/TextStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/TextStyleImpl.java
@@ -20,30 +20,31 @@
 import org.eclipse.gmf.runtime.notation.TextStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Text Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Text
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.TextStyleImpl#getTextAlignment <em>Text Alignment</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.TextStyleImpl#getTextAlignment
+ * <em>Text Alignment</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class TextStyleImpl extends MinimalEObjectImpl.Container implements TextStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags = 0;
-	
+
 	/**
-	 * The default value of the '{@link #getTextAlignment() <em>Text Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTextAlignment() <em>Text
+	 * Alignment</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTextAlignment()
 	 * @generated
 	 * @ordered
@@ -51,36 +52,40 @@
 	protected static final TextAlignment TEXT_ALIGNMENT_EDEFAULT = TextAlignment.LEFT_LITERAL;
 
 	/**
-	 * The offset of the flags representing the value of the '{@link #getTextAlignment() <em>Text Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The offset of the flags representing the value of the
+	 * '{@link #getTextAlignment() <em>Text Alignment</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int TEXT_ALIGNMENT_EFLAG_OFFSET = 8;
 
 	/**
-	 * The flags representing the default value of the '{@link #getTextAlignment() <em>Text Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the default value of the '{@link #getTextAlignment()
+	 * <em>Text Alignment</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int TEXT_ALIGNMENT_EFLAG_DEFAULT = TextAlignment.VALUES.indexOf(TEXT_ALIGNMENT_EDEFAULT) << TEXT_ALIGNMENT_EFLAG_OFFSET;
+	protected static final int TEXT_ALIGNMENT_EFLAG_DEFAULT = TextAlignment.VALUES
+			.indexOf(TEXT_ALIGNMENT_EDEFAULT) << TEXT_ALIGNMENT_EFLAG_OFFSET;
 
 	/**
 	 * The array of enumeration values for '{@link TextAlignment Text Alignment}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	private static final TextAlignment[] TEXT_ALIGNMENT_EFLAG_VALUES = (TextAlignment[])TextAlignment.VALUES.toArray(new TextAlignment[TextAlignment.VALUES.size()]);
+	private static final TextAlignment[] TEXT_ALIGNMENT_EFLAG_VALUES = (TextAlignment[]) TextAlignment.VALUES
+			.toArray(new TextAlignment[TextAlignment.VALUES.size()]);
 
 	/**
-	 * The flags representing the value of the '{@link #getTextAlignment() <em>Text Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The flags representing the value of the '{@link #getTextAlignment() <em>Text
+	 * Alignment</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTextAlignment()
 	 * @generated
 	 * @ordered
@@ -88,8 +93,8 @@
 	protected static final int TEXT_ALIGNMENT_EFLAG = 0x3 << TEXT_ALIGNMENT_EFLAG_OFFSET;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TextStyleImpl() {
@@ -97,8 +102,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -106,8 +111,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TextAlignment getTextAlignment() {
@@ -115,79 +120,84 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTextAlignment(TextAlignment newTextAlignment) {
-		TextAlignment oldTextAlignment = TEXT_ALIGNMENT_EFLAG_VALUES[(eFlags & TEXT_ALIGNMENT_EFLAG) >>> TEXT_ALIGNMENT_EFLAG_OFFSET];
-		if (newTextAlignment == null) newTextAlignment = TEXT_ALIGNMENT_EDEFAULT;
-		eFlags = eFlags & ~TEXT_ALIGNMENT_EFLAG | TextAlignment.VALUES.indexOf(newTextAlignment) << TEXT_ALIGNMENT_EFLAG_OFFSET;
+		TextAlignment oldTextAlignment = TEXT_ALIGNMENT_EFLAG_VALUES[(eFlags
+				& TEXT_ALIGNMENT_EFLAG) >>> TEXT_ALIGNMENT_EFLAG_OFFSET];
+		if (newTextAlignment == null)
+			newTextAlignment = TEXT_ALIGNMENT_EDEFAULT;
+		eFlags = eFlags & ~TEXT_ALIGNMENT_EFLAG
+				| TextAlignment.VALUES.indexOf(newTextAlignment) << TEXT_ALIGNMENT_EFLAG_OFFSET;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT, oldTextAlignment, newTextAlignment));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT,
+					oldTextAlignment, newTextAlignment));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT:
-				return getTextAlignment();
+		case NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT:
+			return getTextAlignment();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT:
-				setTextAlignment((TextAlignment)newValue);
-				return;
+		case NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT:
+			setTextAlignment((TextAlignment) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT:
-				setTextAlignment(TEXT_ALIGNMENT_EDEFAULT);
-				return;
+		case NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT:
+			setTextAlignment(TEXT_ALIGNMENT_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT:
-				return (eFlags & TEXT_ALIGNMENT_EFLAG) != TEXT_ALIGNMENT_EFLAG_DEFAULT;
+		case NotationPackage.TEXT_STYLE__TEXT_ALIGNMENT:
+			return (eFlags & TEXT_ALIGNMENT_EFLAG) != TEXT_ALIGNMENT_EFLAG_DEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (textAlignment: "); //$NON-NLS-1$
@@ -196,4 +206,4 @@
 		return result.toString();
 	}
 
-} //TextStyleImpl
+} // TextStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/TitleStyleImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/TitleStyleImpl.java
index 9362edb..acf8e17 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/TitleStyleImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/TitleStyleImpl.java
@@ -20,15 +20,15 @@
 import org.eclipse.gmf.runtime.notation.TitleStyle;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Title Style</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Title
+ * Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl#isShowTitle <em>Show Title</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl#isShowTitle
+ * <em>Show Title</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -36,133 +36,139 @@
  * @canBeSeenBy %partners
  */
 public class TitleStyleImpl extends MinimalEObjectImpl.Container implements TitleStyle {
-	
+
 	/**
 	 * int field to store booleans and enums
-	 * @since 1.2 
+	 * 
+	 * @since 1.2
 	 */
 	protected int eFlags;
-	
-    /**
-	 * The default value of the '{@link #isShowTitle() <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+
+	/**
+	 * The default value of the '{@link #isShowTitle() <em>Show Title</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isShowTitle()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final boolean SHOW_TITLE_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isShowTitle() <em>Show Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isShowTitle() <em>Show
+	 * Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isShowTitle()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int SHOW_TITLE_EFLAG = 1 << 8;
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TitleStyleImpl() {
 		super();
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
 		return NotationPackage.Literals.TITLE_STYLE;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isShowTitle() {
 		return (eFlags & SHOW_TITLE_EFLAG) != 0;
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setShowTitle(boolean newShowTitle) {
 		boolean oldShowTitle = (eFlags & SHOW_TITLE_EFLAG) != 0;
-		if (newShowTitle) eFlags |= SHOW_TITLE_EFLAG; else eFlags &= ~SHOW_TITLE_EFLAG;
+		if (newShowTitle)
+			eFlags |= SHOW_TITLE_EFLAG;
+		else
+			eFlags &= ~SHOW_TITLE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.TITLE_STYLE__SHOW_TITLE, oldShowTitle, newShowTitle));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.TITLE_STYLE__SHOW_TITLE, oldShowTitle,
+					newShowTitle));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.TITLE_STYLE__SHOW_TITLE:
-				return isShowTitle() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.TITLE_STYLE__SHOW_TITLE:
+			return isShowTitle() ? Boolean.TRUE : Boolean.FALSE;
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.TITLE_STYLE__SHOW_TITLE:
-				setShowTitle(((Boolean)newValue).booleanValue());
-				return;
+		case NotationPackage.TITLE_STYLE__SHOW_TITLE:
+			setShowTitle(((Boolean) newValue).booleanValue());
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.TITLE_STYLE__SHOW_TITLE:
-				setShowTitle(SHOW_TITLE_EDEFAULT);
-				return;
+		case NotationPackage.TITLE_STYLE__SHOW_TITLE:
+			setShowTitle(SHOW_TITLE_EDEFAULT);
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.TITLE_STYLE__SHOW_TITLE:
-				return ((eFlags & SHOW_TITLE_EFLAG) != 0) != SHOW_TITLE_EDEFAULT;
+		case NotationPackage.TITLE_STYLE__SHOW_TITLE:
+			return ((eFlags & SHOW_TITLE_EFLAG) != 0) != SHOW_TITLE_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (showTitle: "); //$NON-NLS-1$
@@ -171,4 +177,4 @@
 		return result.toString();
 	}
 
-} //TitleStyleImpl
+} // TitleStyleImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ViewImpl.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ViewImpl.java
index 373ef22..85e4699 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ViewImpl.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/ViewImpl.java
@@ -41,356 +41,401 @@
 import org.eclipse.gmf.runtime.notation.View;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>View</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object
+ * '<em><b>View</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#isVisible <em>Visible</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#isMutable <em>Mutable</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getSourceEdges <em>Source Edges</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getTargetEdges <em>Target Edges</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getPersistedChildren <em>Persisted Children</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getStyles <em>Styles</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getElement <em>Element</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getDiagram <em>Diagram</em>}</li>
- *   <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getTransientChildren <em>Transient Children</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#isVisible
+ * <em>Visible</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getType
+ * <em>Type</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#isMutable
+ * <em>Mutable</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getSourceEdges
+ * <em>Source Edges</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getTargetEdges
+ * <em>Target Edges</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getPersistedChildren
+ * <em>Persisted Children</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getStyles
+ * <em>Styles</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getElement
+ * <em>Element</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getDiagram
+ * <em>Diagram</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.impl.ViewImpl#getTransientChildren
+ * <em>Transient Children</em>}</li>
+ * </ul>
  *
  * @generated
  */
 /*
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
-public abstract class ViewImpl
-    extends EModelElementImpl
-    implements View {
+public abstract class ViewImpl extends EModelElementImpl implements View {
 
-    /**
+	/**
 	 * The default value of the '{@link #isVisible() <em>Visible</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isVisible()
 	 * @generated
 	 * @ordered
 	 */
-    protected static final boolean VISIBLE_EDEFAULT = true;
+	protected static final boolean VISIBLE_EDEFAULT = true;
 
-    /**
-	 * The flag representing the value of the '{@link #isVisible() <em>Visible</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isVisible()
+	 * <em>Visible</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isVisible()
 	 * @generated
 	 * @ordered
 	 */
-    protected static final int VISIBLE_EFLAG = 1 << 8;
+	protected static final int VISIBLE_EFLAG = 1 << 8;
 
-    /**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
 	 */
-    protected static final String TYPE_EDEFAULT = ""; //$NON-NLS-1$
+	protected static final String TYPE_EDEFAULT = ""; //$NON-NLS-1$
 
-    /**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
 	 */
-    protected String type = TYPE_EDEFAULT;
+	protected String type = TYPE_EDEFAULT;
 
-    /**
+	/**
 	 * The default value of the '{@link #isMutable() <em>Mutable</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isMutable()
 	 * @generated
 	 * @ordered
 	 */
-    protected static final boolean MUTABLE_EDEFAULT = false;
+	protected static final boolean MUTABLE_EDEFAULT = false;
 
-    /**
-	 * The flag representing the value of the '{@link #isMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The flag representing the value of the '{@link #isMutable()
+	 * <em>Mutable</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isMutable()
 	 * @generated
 	 * @ordered
 	 */
-    protected static final int MUTABLE_EFLAG = 1 << 9;
+	protected static final int MUTABLE_EFLAG = 1 << 9;
 
-    /**
-	 * The cached value of the '{@link #getSourceEdges() <em>Source Edges</em>}' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getSourceEdges() <em>Source Edges</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceEdges()
 	 * @generated
 	 * @ordered
 	 */
-    protected EList sourceEdges;
+	protected EList sourceEdges;
 
-    /**
-	 * The cached value of the '{@link #getTargetEdges() <em>Target Edges</em>}' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getTargetEdges() <em>Target Edges</em>}'
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetEdges()
 	 * @generated
 	 * @ordered
 	 */
-    protected EList targetEdges;
+	protected EList targetEdges;
 
-    /**
-	 * The cached value of the '{@link #getPersistedChildren() <em>Persisted Children</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getPersistedChildren() <em>Persisted
+	 * Children</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getPersistedChildren()
 	 * @generated
 	 * @ordered
 	 */
-    protected EList persistedChildren;
+	protected EList persistedChildren;
 
-    /**
-	 * The cached value of the '{@link #getStyles() <em>Styles</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getStyles() <em>Styles</em>}' containment
+	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStyles()
 	 * @generated
 	 * @ordered
 	 */
-    protected EList styles;
+	protected EList styles;
 
-    /**
+	/**
 	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getElement()
 	 * @generated
 	 * @ordered
 	 */
-    protected EObject element;
+	protected EObject element;
 
-    /**
-	 * The flag representing whether the Element reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The flag representing whether the Element reference has been set. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int ELEMENT_ESETFLAG = 1 << 10;
 
-				/**
-	 * The cached value of the '{@link #getTransientChildren() <em>Transient Children</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	/**
+	 * The cached value of the '{@link #getTransientChildren() <em>Transient
+	 * Children</em>}' containment reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getTransientChildren()
 	 * @generated
 	 * @ordered
 	 */
-    protected EList transientChildren;
+	protected EList transientChildren;
 
-    // EATM
-    // private EContentsEList allChildren = null;
+	// EATM
+	// private EContentsEList allChildren = null;
 
-    protected static final EStructuralFeature[] childrenFeatures = new EStructuralFeature[] {
-        NotationPackage.Literals.VIEW__PERSISTED_CHILDREN,
-        NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN};
+	protected static final EStructuralFeature[] childrenFeatures = new EStructuralFeature[] {
+			NotationPackage.Literals.VIEW__PERSISTED_CHILDREN, NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN };
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    protected ViewImpl() {
+	protected ViewImpl() {
 		super();
 		eFlags |= VISIBLE_EFLAG;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    protected EClass eStaticClass() {
+	protected EClass eStaticClass() {
 		return NotationPackage.Literals.VIEW;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean isVisible() {
+	public boolean isVisible() {
 		return (eFlags & VISIBLE_EFLAG) != 0;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void setVisible(boolean newVisible) {
+	public void setVisible(boolean newVisible) {
 		boolean oldVisible = (eFlags & VISIBLE_EFLAG) != 0;
-		if (newVisible) eFlags |= VISIBLE_EFLAG; else eFlags &= ~VISIBLE_EFLAG;
+		if (newVisible)
+			eFlags |= VISIBLE_EFLAG;
+		else
+			eFlags &= ~VISIBLE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__VISIBLE, oldVisible, newVisible));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__VISIBLE, oldVisible,
+					newVisible));
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public String getType() {
+	public String getType() {
 		return type;
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public void setType(String newType) {
-        setTypeGen(newType == null ? null : newType.intern());
-    }
-    
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-     * @since 1.2
+	 * 
+	 * @generated NOT
 	 */
-    public void setTypeGen(String newType) {
+	public void setType(String newType) {
+		setTypeGen(newType == null ? null : newType.intern());
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @since 1.2
+	 */
+	public void setTypeGen(String newType) {
 		String oldType = type;
 		type = newType;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__TYPE, oldType, type));
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean isMutable() {
+	public boolean isMutable() {
 		return (eFlags & MUTABLE_EFLAG) != 0;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void setMutable(boolean newMutable) {
+	public void setMutable(boolean newMutable) {
 		boolean oldMutable = (eFlags & MUTABLE_EFLAG) != 0;
-		if (newMutable) eFlags |= MUTABLE_EFLAG; else eFlags &= ~MUTABLE_EFLAG;
+		if (newMutable)
+			eFlags |= MUTABLE_EFLAG;
+		else
+			eFlags &= ~MUTABLE_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__MUTABLE, oldMutable, newMutable));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__MUTABLE, oldMutable,
+					newMutable));
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public EList getSourceEdges() {
+	public EList getSourceEdges() {
 		if (sourceEdges == null) {
-			sourceEdges = new EObjectWithInverseEList(Edge.class, this, NotationPackage.VIEW__SOURCE_EDGES, NotationPackage.EDGE__SOURCE);
+			sourceEdges = new EObjectWithInverseEList(Edge.class, this, NotationPackage.VIEW__SOURCE_EDGES,
+					NotationPackage.EDGE__SOURCE);
 		}
 		return sourceEdges;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public EList getTargetEdges() {
+	public EList getTargetEdges() {
 		if (targetEdges == null) {
-			targetEdges = new EObjectWithInverseEList(Edge.class, this, NotationPackage.VIEW__TARGET_EDGES, NotationPackage.EDGE__TARGET);
+			targetEdges = new EObjectWithInverseEList(Edge.class, this, NotationPackage.VIEW__TARGET_EDGES,
+					NotationPackage.EDGE__TARGET);
 		}
 		return targetEdges;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public EList getPersistedChildren() {
+	public EList getPersistedChildren() {
 		if (persistedChildren == null) {
 			persistedChildren = new EObjectContainmentEList(Node.class, this, NotationPackage.VIEW__PERSISTED_CHILDREN);
 		}
 		return persistedChildren;
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public EList getChildren() {
-        return new EContentsEList(this, childrenFeatures);
-        // if (allChildren == null) {
-        //     allChildren = new EContentsEList(this, childrenFeatures);
-        // }
-        // return allChildren;
-    }
-
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public EList getChildren() {
+		return new EContentsEList(this, childrenFeatures);
+		// if (allChildren == null) {
+		// allChildren = new EContentsEList(this, childrenFeatures);
+		// }
+		// return allChildren;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public EList getStyles() {
+	public EList getStyles() {
 		if (styles == null) {
 			styles = new EObjectContainmentEList(Style.class, this, NotationPackage.VIEW__STYLES);
 		}
 		return styles;
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public EObject getElement() {
-        if (!isSetElement()) {
-            EObject container = eContainer();
-            if (container instanceof View) {
-                View view = (View) container;
-                return view.getElement();
-            }
-        }
-        
-        return getElementGen();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EObject getElementGen() {
-    	if (element != null && element.eIsProxy()) {
-    		EObject oldElement = element;
-    		element = eResolveProxy((InternalEObject) element);
-    		if (element != oldElement) {
-    			if (eNotificationRequired())
-    				eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-    						NotationPackage.VIEW__ELEMENT, oldElement, element));
-    		}
-    	}
-    	
-    	return element;
-    }
-    
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public EObject getElement() {
+		if (!isSetElement()) {
+			EObject container = eContainer();
+			if (container instanceof View) {
+				View view = (View) container;
+				return view.getElement();
+			}
+		}
+
+		return getElementGen();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public EObject basicGetElement() {
+	public EObject getElementGen() {
+		if (element != null && element.eIsProxy()) {
+			InternalEObject oldElement = (InternalEObject) element;
+			element = eResolveProxy(oldElement);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NotationPackage.VIEW__ELEMENT, oldElement,
+							element));
+			}
+		}
 		return element;
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void setElement(EObject newElement) {
+	public EObject basicGetElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setElement(EObject newElement) {
 		EObject oldElement = element;
 		element = newElement;
 		boolean oldElementESet = (eFlags & ELEMENT_ESETFLAG) != 0;
 		eFlags |= ELEMENT_ESETFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__ELEMENT, oldElement, element, !oldElementESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.VIEW__ELEMENT, oldElement, element,
+					!oldElementESet));
 	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetElement() {
@@ -399,304 +444,312 @@
 		element = null;
 		eFlags &= ~ELEMENT_ESETFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, NotationPackage.VIEW__ELEMENT, oldElement, null, oldElementESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, NotationPackage.VIEW__ELEMENT, oldElement, null,
+					oldElementESet));
 	}
 
-				/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetElement() {
 		return (eFlags & ELEMENT_ESETFLAG) != 0;
 	}
 
-				/**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Diagram getDiagram() {
+	public Diagram getDiagram() {
 		Diagram diagram = basicGetDiagram();
-		return diagram != null && diagram.eIsProxy() ? (Diagram)eResolveProxy((InternalEObject)diagram) : diagram;
+		return diagram != null && diagram.eIsProxy() ? (Diagram) eResolveProxy((InternalEObject) diagram) : diagram;
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public Diagram basicGetDiagram() {
-        for (EObject parent = this; parent != null; parent = ((InternalEObject)parent)
-            .eInternalContainer())
-            if (NotationPackage.Literals.DIAGRAM.isSuperTypeOf(
-                parent.eClass()))
-                return (Diagram) parent;
-        return null;
-    }
-
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public Diagram basicGetDiagram() {
+		for (EObject parent = this; parent != null; parent = ((InternalEObject) parent).eInternalContainer())
+			if (NotationPackage.Literals.DIAGRAM.isSuperTypeOf(parent.eClass()))
+				return (Diagram) parent;
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public EList getTransientChildren() {
+	public EList getTransientChildren() {
 		if (transientChildren == null) {
 			transientChildren = new EObjectContainmentEList(Node.class, this, NotationPackage.VIEW__TRANSIENT_CHILDREN);
 		}
 		return transientChildren;
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public Style getStyle(EClass eClass) {
-    	if (eClass != null && NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {
-    		if (eClass.isSuperTypeOf(eClass())) {
-    			return (Style) this;
-    		}
-            if (eIsSet(NotationPackage.Literals.VIEW__STYLES)) {
-                for (Iterator i = getStyles().iterator(); i.hasNext();) {
-                    Style style = (Style) i.next();
-                    if (style.eClass() == eClass || eClass.isInstance(style))
-                        return style;
-                }
-            }    		
-    	}
-        return null;
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public Style getStyle(EClass eClass) {
+		if (eClass != null && NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {
+			if (eClass.isSuperTypeOf(eClass())) {
+				return (Style) this;
+			}
+			if (eIsSet(NotationPackage.Literals.VIEW__STYLES)) {
+				for (Iterator i = getStyles().iterator(); i.hasNext();) {
+					Style style = (Style) i.next();
+					if (style.eClass() == eClass || eClass.isInstance(style))
+						return style;
+				}
+			}
+		}
+		return null;
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public Node createChild(EClass eClass) {
-        Node newChild = (Node) eClass.getEPackage().getEFactoryInstance()
-            .create(eClass);
-        getPersistedChildren().add(newChild);
-        return newChild;
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public Node createChild(EClass eClass) {
+		Node newChild = (Node) eClass.getEPackage().getEFactoryInstance().create(eClass);
+		getPersistedChildren().add(newChild);
+		return newChild;
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public Style createStyle(EClass eClass) {
-        Style newStyle = (Style) eClass.getEPackage().getEFactoryInstance()
-            .create(eClass);
-        getStyles().add(newStyle);
-        return newStyle;
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public Style createStyle(EClass eClass) {
+		Style newStyle = (Style) eClass.getEPackage().getEFactoryInstance().create(eClass);
+		getStyles().add(newStyle);
+		return newStyle;
+	}
 
-    /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public NamedStyle getNamedStyle(EClass eClass, String name) {
-        if (eClass != null
-                && eIsSet(NotationPackage.Literals.VIEW__STYLES)
-                && NotationPackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
-                for (Iterator i = getStyles().iterator(); i.hasNext();) {
-                    Style style = (Style) i.next();
-                    if (style.eClass() == eClass || eClass.isInstance(style))
-                        if (style.eGet(NotationPackage.eINSTANCE.getNamedStyle_Name()).equals(name))
-                        	return (NamedStyle)style;
-                }
-            }
-            return null;
+		if (eClass != null && eIsSet(NotationPackage.Literals.VIEW__STYLES)
+				&& NotationPackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
+			for (Iterator i = getStyles().iterator(); i.hasNext();) {
+				Style style = (Style) i.next();
+				if (style.eClass() == eClass || eClass.isInstance(style))
+					if (style.eGet(NotationPackage.eINSTANCE.getNamedStyle_Name()).equals(name))
+						return (NamedStyle) style;
+			}
+		}
+		return null;
 	}
 
-				/**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.VIEW__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-			case NotationPackage.VIEW__SOURCE_EDGES:
-				return ((InternalEList)getSourceEdges()).basicAdd(otherEnd, msgs);
-			case NotationPackage.VIEW__TARGET_EDGES:
-				return ((InternalEList)getTargetEdges()).basicAdd(otherEnd, msgs);
+		case NotationPackage.VIEW__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicAdd(otherEnd, msgs);
+		case NotationPackage.VIEW__SOURCE_EDGES:
+			return ((InternalEList) getSourceEdges()).basicAdd(otherEnd, msgs);
+		case NotationPackage.VIEW__TARGET_EDGES:
+			return ((InternalEList) getTargetEdges()).basicAdd(otherEnd, msgs);
 		}
 		return eDynamicInverseAdd(otherEnd, featureID, msgs);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case NotationPackage.VIEW__EANNOTATIONS:
-				return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-			case NotationPackage.VIEW__SOURCE_EDGES:
-				return ((InternalEList)getSourceEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.VIEW__TARGET_EDGES:
-				return ((InternalEList)getTargetEdges()).basicRemove(otherEnd, msgs);
-			case NotationPackage.VIEW__PERSISTED_CHILDREN:
-				return ((InternalEList)getPersistedChildren()).basicRemove(otherEnd, msgs);
-			case NotationPackage.VIEW__STYLES:
-				return ((InternalEList)getStyles()).basicRemove(otherEnd, msgs);
-			case NotationPackage.VIEW__TRANSIENT_CHILDREN:
-				return ((InternalEList)getTransientChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.VIEW__EANNOTATIONS:
+			return ((InternalEList) getEAnnotations()).basicRemove(otherEnd, msgs);
+		case NotationPackage.VIEW__SOURCE_EDGES:
+			return ((InternalEList) getSourceEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.VIEW__TARGET_EDGES:
+			return ((InternalEList) getTargetEdges()).basicRemove(otherEnd, msgs);
+		case NotationPackage.VIEW__PERSISTED_CHILDREN:
+			return ((InternalEList) getPersistedChildren()).basicRemove(otherEnd, msgs);
+		case NotationPackage.VIEW__STYLES:
+			return ((InternalEList) getStyles()).basicRemove(otherEnd, msgs);
+		case NotationPackage.VIEW__TRANSIENT_CHILDREN:
+			return ((InternalEList) getTransientChildren()).basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case NotationPackage.VIEW__EANNOTATIONS:
-				return getEAnnotations();
-			case NotationPackage.VIEW__VISIBLE:
-				return isVisible() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.VIEW__TYPE:
-				return getType();
-			case NotationPackage.VIEW__MUTABLE:
-				return isMutable() ? Boolean.TRUE : Boolean.FALSE;
-			case NotationPackage.VIEW__SOURCE_EDGES:
-				return getSourceEdges();
-			case NotationPackage.VIEW__TARGET_EDGES:
-				return getTargetEdges();
-			case NotationPackage.VIEW__PERSISTED_CHILDREN:
-				return getPersistedChildren();
-			case NotationPackage.VIEW__STYLES:
-				return getStyles();
-			case NotationPackage.VIEW__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-			case NotationPackage.VIEW__DIAGRAM:
-				if (resolve) return getDiagram();
-				return basicGetDiagram();
-			case NotationPackage.VIEW__TRANSIENT_CHILDREN:
-				return getTransientChildren();
+		case NotationPackage.VIEW__EANNOTATIONS:
+			return getEAnnotations();
+		case NotationPackage.VIEW__VISIBLE:
+			return isVisible() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.VIEW__TYPE:
+			return getType();
+		case NotationPackage.VIEW__MUTABLE:
+			return isMutable() ? Boolean.TRUE : Boolean.FALSE;
+		case NotationPackage.VIEW__SOURCE_EDGES:
+			return getSourceEdges();
+		case NotationPackage.VIEW__TARGET_EDGES:
+			return getTargetEdges();
+		case NotationPackage.VIEW__PERSISTED_CHILDREN:
+			return getPersistedChildren();
+		case NotationPackage.VIEW__STYLES:
+			return getStyles();
+		case NotationPackage.VIEW__ELEMENT:
+			if (resolve)
+				return getElement();
+			return basicGetElement();
+		case NotationPackage.VIEW__DIAGRAM:
+			if (resolve)
+				return getDiagram();
+			return basicGetDiagram();
+		case NotationPackage.VIEW__TRANSIENT_CHILDREN:
+			return getTransientChildren();
 		}
 		return eDynamicGet(featureID, resolve, coreType);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eSet(int featureID, Object newValue) {
+	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case NotationPackage.VIEW__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case NotationPackage.VIEW__VISIBLE:
-				setVisible(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.VIEW__TYPE:
-				setType((String)newValue);
-				return;
-			case NotationPackage.VIEW__MUTABLE:
-				setMutable(((Boolean)newValue).booleanValue());
-				return;
-			case NotationPackage.VIEW__SOURCE_EDGES:
-				getSourceEdges().clear();
-				getSourceEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.VIEW__TARGET_EDGES:
-				getTargetEdges().clear();
-				getTargetEdges().addAll((Collection)newValue);
-				return;
-			case NotationPackage.VIEW__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				getPersistedChildren().addAll((Collection)newValue);
-				return;
-			case NotationPackage.VIEW__STYLES:
-				getStyles().clear();
-				getStyles().addAll((Collection)newValue);
-				return;
-			case NotationPackage.VIEW__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-			case NotationPackage.VIEW__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				getTransientChildren().addAll((Collection)newValue);
-				return;
+		case NotationPackage.VIEW__EANNOTATIONS:
+			getEAnnotations().clear();
+			getEAnnotations().addAll((Collection) newValue);
+			return;
+		case NotationPackage.VIEW__VISIBLE:
+			setVisible(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.VIEW__TYPE:
+			setType((String) newValue);
+			return;
+		case NotationPackage.VIEW__MUTABLE:
+			setMutable(((Boolean) newValue).booleanValue());
+			return;
+		case NotationPackage.VIEW__SOURCE_EDGES:
+			getSourceEdges().clear();
+			getSourceEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.VIEW__TARGET_EDGES:
+			getTargetEdges().clear();
+			getTargetEdges().addAll((Collection) newValue);
+			return;
+		case NotationPackage.VIEW__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			getPersistedChildren().addAll((Collection) newValue);
+			return;
+		case NotationPackage.VIEW__STYLES:
+			getStyles().clear();
+			getStyles().addAll((Collection) newValue);
+			return;
+		case NotationPackage.VIEW__ELEMENT:
+			setElement((EObject) newValue);
+			return;
+		case NotationPackage.VIEW__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			getTransientChildren().addAll((Collection) newValue);
+			return;
 		}
 		eDynamicSet(featureID, newValue);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public void eUnset(int featureID) {
+	public void eUnset(int featureID) {
 		switch (featureID) {
-			case NotationPackage.VIEW__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case NotationPackage.VIEW__VISIBLE:
-				setVisible(VISIBLE_EDEFAULT);
-				return;
-			case NotationPackage.VIEW__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NotationPackage.VIEW__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case NotationPackage.VIEW__SOURCE_EDGES:
-				getSourceEdges().clear();
-				return;
-			case NotationPackage.VIEW__TARGET_EDGES:
-				getTargetEdges().clear();
-				return;
-			case NotationPackage.VIEW__PERSISTED_CHILDREN:
-				getPersistedChildren().clear();
-				return;
-			case NotationPackage.VIEW__STYLES:
-				getStyles().clear();
-				return;
-			case NotationPackage.VIEW__ELEMENT:
-				unsetElement();
-				return;
-			case NotationPackage.VIEW__TRANSIENT_CHILDREN:
-				getTransientChildren().clear();
-				return;
+		case NotationPackage.VIEW__EANNOTATIONS:
+			getEAnnotations().clear();
+			return;
+		case NotationPackage.VIEW__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case NotationPackage.VIEW__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case NotationPackage.VIEW__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case NotationPackage.VIEW__SOURCE_EDGES:
+			getSourceEdges().clear();
+			return;
+		case NotationPackage.VIEW__TARGET_EDGES:
+			getTargetEdges().clear();
+			return;
+		case NotationPackage.VIEW__PERSISTED_CHILDREN:
+			getPersistedChildren().clear();
+			return;
+		case NotationPackage.VIEW__STYLES:
+			getStyles().clear();
+			return;
+		case NotationPackage.VIEW__ELEMENT:
+			unsetElement();
+			return;
+		case NotationPackage.VIEW__TRANSIENT_CHILDREN:
+			getTransientChildren().clear();
+			return;
 		}
 		eDynamicUnset(featureID);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public boolean eIsSet(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case NotationPackage.VIEW__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case NotationPackage.VIEW__VISIBLE:
-				return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
-			case NotationPackage.VIEW__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NotationPackage.VIEW__MUTABLE:
-				return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
-			case NotationPackage.VIEW__SOURCE_EDGES:
-				return sourceEdges != null && !sourceEdges.isEmpty();
-			case NotationPackage.VIEW__TARGET_EDGES:
-				return targetEdges != null && !targetEdges.isEmpty();
-			case NotationPackage.VIEW__PERSISTED_CHILDREN:
-				return persistedChildren != null && !persistedChildren.isEmpty();
-			case NotationPackage.VIEW__STYLES:
-				return styles != null && !styles.isEmpty();
-			case NotationPackage.VIEW__ELEMENT:
-				return isSetElement();
-			case NotationPackage.VIEW__DIAGRAM:
-				return basicGetDiagram() != null;
-			case NotationPackage.VIEW__TRANSIENT_CHILDREN:
-				return transientChildren != null && !transientChildren.isEmpty();
+		case NotationPackage.VIEW__EANNOTATIONS:
+			return eAnnotations != null && !eAnnotations.isEmpty();
+		case NotationPackage.VIEW__VISIBLE:
+			return ((eFlags & VISIBLE_EFLAG) != 0) != VISIBLE_EDEFAULT;
+		case NotationPackage.VIEW__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case NotationPackage.VIEW__MUTABLE:
+			return ((eFlags & MUTABLE_EFLAG) != 0) != MUTABLE_EDEFAULT;
+		case NotationPackage.VIEW__SOURCE_EDGES:
+			return sourceEdges != null && !sourceEdges.isEmpty();
+		case NotationPackage.VIEW__TARGET_EDGES:
+			return targetEdges != null && !targetEdges.isEmpty();
+		case NotationPackage.VIEW__PERSISTED_CHILDREN:
+			return persistedChildren != null && !persistedChildren.isEmpty();
+		case NotationPackage.VIEW__STYLES:
+			return styles != null && !styles.isEmpty();
+		case NotationPackage.VIEW__ELEMENT:
+			return isSetElement();
+		case NotationPackage.VIEW__DIAGRAM:
+			return basicGetDiagram() != null;
+		case NotationPackage.VIEW__TRANSIENT_CHILDREN:
+			return transientChildren != null && !transientChildren.isEmpty();
 		}
 		return eDynamicIsSet(featureID);
 	}
 
-    /**
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-    public String toString() {
-		if (eIsProxy()) return super.toString();
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (visible: "); //$NON-NLS-1$
@@ -709,107 +762,104 @@
 		return result.toString();
 	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void persistChildren() {
-    	if (eIsSet(NotationPackage.VIEW__TRANSIENT_CHILDREN)) {
-            getPersistedChildren().addAll(getTransientChildren());
-        }
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void persistChildren() {
+		if (eIsSet(NotationPackage.VIEW__TRANSIENT_CHILDREN)) {
+			getPersistedChildren().addAll(getTransientChildren());
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertChild(View child) {
-        persistChildren();
-        getPersistedChildren().add(child);
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertChild(View child) {
+		persistChildren();
+		getPersistedChildren().add(child);
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertChildAt(View child, int index) {
-        persistChildren();
-        if (getPersistedChildren().size() >= index) {
-            getPersistedChildren().add(index, child);
-        }
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertChildAt(View child, int index) {
+		persistChildren();
+		if (getPersistedChildren().size() >= index) {
+			getPersistedChildren().add(index, child);
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void insertChild(View child, boolean persisted) {
-        List children = null;
-        if (persisted)
-            children = getPersistedChildren();
-        else
-            children = getTransientChildren();
-        children.add(child);
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void insertChild(View child, boolean persisted) {
+		List children = null;
+		if (persisted)
+			children = getPersistedChildren();
+		else
+			children = getTransientChildren();
+		children.add(child);
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void removeChild(View child) {
-    	if (child.eContainer() == this) {
-	        EStructuralFeature eContainingFeature = child.eContainingFeature();
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void removeChild(View child) {
+		if (child.eContainer() == this) {
+			EStructuralFeature eContainingFeature = child.eContainingFeature();
 			if (eContainingFeature == NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN) {
-	        	getTransientChildren().remove(child);
-	        } else if (eContainingFeature == NotationPackage.Literals.VIEW__PERSISTED_CHILDREN) {
-	        	getPersistedChildren().remove(child);
-	        }
-    	}
-    }
+				getTransientChildren().remove(child);
+			} else if (eContainingFeature == NotationPackage.Literals.VIEW__PERSISTED_CHILDREN) {
+				getPersistedChildren().remove(child);
+			}
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public void persist() {
-    	EObject eContainer = eContainer();
-        if (eContainer instanceof View) {
-        	EStructuralFeature eContaingFeature = eContainingFeature();
-	        if (eContaingFeature != null && eContaingFeature.isTransient()) {
-	            View vContainer = (View) eContainer;
-	            vContainer.persistChildren();
-	        }
-        }
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public void persist() {
+		EObject eContainer = eContainer();
+		if (eContainer instanceof View) {
+			EStructuralFeature eContaingFeature = eContainingFeature();
+			if (eContaingFeature != null && eContaingFeature.isTransient()) {
+				View vContainer = (View) eContainer;
+				vContainer.persistChildren();
+			}
+		}
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     */
-    public EList getVisibleChildren() {
-    	boolean persistedChildrenSet = eIsSet(NotationPackage.VIEW__PERSISTED_CHILDREN);
-    	boolean transientChildrenSet = eIsSet(NotationPackage.VIEW__TRANSIENT_CHILDREN);
-    	
-        if (!persistedChildrenSet && !transientChildrenSet) {
-            return ECollections.EMPTY_ELIST;
-        }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 */
+	public EList getVisibleChildren() {
+		boolean persistedChildrenSet = eIsSet(NotationPackage.VIEW__PERSISTED_CHILDREN);
+		boolean transientChildrenSet = eIsSet(NotationPackage.VIEW__TRANSIENT_CHILDREN);
 
-        List _children = new ArrayList();
-        if (persistedChildrenSet) {
-        	EList persistedChildren = getPersistedChildren();
-            for (Iterator iter = persistedChildren.iterator(); iter
-                .hasNext();) {
-                View view = (View) iter.next();
-                if (view.isVisible())
-                    _children.add(view);
-            }
-        }
+		if (!persistedChildrenSet && !transientChildrenSet) {
+			return ECollections.EMPTY_ELIST;
+		}
 
-        if (transientChildrenSet) {
-        	EList transientChildren = getTransientChildren();
-            for (Iterator iter = transientChildren.iterator(); iter
-                .hasNext();) {
-                View view = (View) iter.next();
-                if (view.isVisible())
-                    _children.add(view);
-            }
-        }       
-        
-        return new BasicEList.UnmodifiableEList(_children.size(), _children
-            .toArray());
-    }
+		List _children = new ArrayList();
+		if (persistedChildrenSet) {
+			EList persistedChildren = getPersistedChildren();
+			for (Iterator iter = persistedChildren.iterator(); iter.hasNext();) {
+				View view = (View) iter.next();
+				if (view.isVisible())
+					_children.add(view);
+			}
+		}
+
+		if (transientChildrenSet) {
+			EList transientChildren = getTransientChildren();
+			for (Iterator iter = transientChildren.iterator(); iter.hasNext();) {
+				View view = (View) iter.next();
+				if (view.isVisible())
+					_children.add(view);
+			}
+		}
+
+		return new BasicEList.UnmodifiableEList(_children.size(), _children.toArray());
+	}
 
 } // ViewImpl
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/AbstractStyleImmutable.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/AbstractStyleImmutable.java
index 2bb3a1e..05e84fa 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/AbstractStyleImmutable.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/AbstractStyleImmutable.java
@@ -12,15 +12,12 @@
 
 package org.eclipse.gmf.runtime.notation.stylepooling;
 
-
-
 /**
  * Base class for StyleImmutables used with style pooling.
  * 
  * @author affrantz@us.ibm.com
  */
 public abstract class AbstractStyleImmutable {
-	/* Base class for StyleImmutables used with style pooling*/
-
+	/* Base class for StyleImmutables used with style pooling */
 
 }
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/FontStyleImplImmutable.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/FontStyleImplImmutable.java
index 352e650..1666126 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/FontStyleImplImmutable.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/FontStyleImplImmutable.java
@@ -12,57 +12,55 @@
 
 package org.eclipse.gmf.runtime.notation.stylepooling;
 
-
-
 /**
- * FontStyleImplImmutable is used by FontStyleImplImmutable in order to share 
- * common data among the various  FontStyleImpl created in the notation.
+ * FontStyleImplImmutable is used by FontStyleImplImmutable in order to share
+ * common data among the various FontStyleImpl created in the notation.
  * 
  * @author affrantz@us.ibm.com
  *
  */
-public class FontStyleImplImmutable extends AbstractStyleImmutable{
-	public static int FONT_NONE 		= 0x00;
-	public static int FONT_BOLD 		= 0x01;
-	public static int FONT_ITALIC 		= 0x02;
-	public static int FONT_UNDERLINE	= 0x04;
-	public static int FONT_STRIKETHRU	= 0x08;
+public class FontStyleImplImmutable extends AbstractStyleImmutable {
+	public static int FONT_NONE = 0x00;
+	public static int FONT_BOLD = 0x01;
+	public static int FONT_ITALIC = 0x02;
+	public static int FONT_UNDERLINE = 0x04;
+	public static int FONT_STRIKETHRU = 0x08;
 
 	/** Style cache */
 	protected static StylePoolContainer myStylePool = new StylePoolContainer();
 
-	
 	private String theName;
 	private Integer theHeight;
 	private Integer theColor;
 	private int theFlags;
 
-	public FontStyleImplImmutable(String name, int height, int color, boolean bStrike , boolean bUnder, boolean bItalic, boolean bBold)
-	{
-		theName 	= name;
-		theHeight	= new Integer(height);
-		theColor	= new Integer(color);
+	public FontStyleImplImmutable(String name, int height, int color, boolean bStrike, boolean bUnder, boolean bItalic,
+			boolean bBold) {
+		theName = name;
+		theHeight = new Integer(height);
+		theColor = new Integer(color);
 
-		theFlags	= FontStyleImplImmutable.getFlagsAsInt(bStrike, bUnder, bItalic, bBold);
+		theFlags = FontStyleImplImmutable.getFlagsAsInt(bStrike, bUnder, bItalic, bBold);
 	}
-	/** get a style from the cache if it exists or create one if it does not*/
-	static public FontStyleImplImmutable getFontStyle(String sNm, int height, int color, boolean bStrike , boolean bUnder, boolean bItalic, boolean bBold)
-	{
-		Integer myKey = new Integer(FontStyleImplImmutable.getFontKey(sNm, height, color,  bStrike ,  bUnder,  bItalic,  bBold));
-		
-		if(myStylePool.containsKey(myKey))
-		{
+
+	/** get a style from the cache if it exists or create one if it does not */
+	static public FontStyleImplImmutable getFontStyle(String sNm, int height, int color, boolean bStrike,
+			boolean bUnder, boolean bItalic, boolean bBold) {
+		Integer myKey = new Integer(
+				FontStyleImplImmutable.getFontKey(sNm, height, color, bStrike, bUnder, bItalic, bBold));
+
+		if (myStylePool.containsKey(myKey)) {
 			return ((FontStyleImplImmutable) myStylePool.get(myKey));
-			
-		}
-		else
-		{
-			
-			FontStyleImplImmutable myValue = new FontStyleImplImmutable(sNm, height, color, bStrike, bUnder, bItalic, bBold);
+
+		} else {
+
+			FontStyleImplImmutable myValue = new FontStyleImplImmutable(sNm, height, color, bStrike, bUnder, bItalic,
+					bBold);
 			myStylePool.put(myKey, myValue);
 			return myValue;
-		}		
+		}
 	}
+
 	/**
 	 * @param name
 	 * @param height
@@ -70,9 +68,9 @@
 	 * @param flags
 	 * @return
 	 */
-	static public int getFontKey(String name, int height, int color, boolean bStrike , boolean bUnder, boolean bItalic, boolean bBold)
-	{
-		int flags = getFlagsAsInt(bStrike , bUnder, bItalic, bBold);
+	static public int getFontKey(String name, int height, int color, boolean bStrike, boolean bUnder, boolean bItalic,
+			boolean bBold) {
+		int flags = getFlagsAsInt(bStrike, bUnder, bItalic, bBold);
 		StringBuffer theBuffer = new StringBuffer();
 		theBuffer.append(name);
 		theBuffer.append(":");//$NON-NLS-1$
@@ -81,61 +79,68 @@
 		theBuffer.append(color);
 		theBuffer.append(":");//$NON-NLS-1$
 		theBuffer.append(flags);
-		
+
 		return theBuffer.toString().hashCode();
-		
-	}	
-	static private int getFlagsAsInt(boolean bStrike , boolean bUnder, boolean bItalic, boolean bBold)
-	{
-		int myInt = FontStyleImplImmutable.FONT_NONE;
-		if(bStrike) myInt|=FontStyleImplImmutable.FONT_STRIKETHRU;
-		if(bUnder) myInt|=FontStyleImplImmutable.FONT_UNDERLINE;
-		if(bItalic) myInt|=FontStyleImplImmutable.FONT_ITALIC;
-		if(bBold) myInt|=FontStyleImplImmutable.FONT_BOLD;
-		
-		return myInt;
-		
+
 	}
+
+	static private int getFlagsAsInt(boolean bStrike, boolean bUnder, boolean bItalic, boolean bBold) {
+		int myInt = FontStyleImplImmutable.FONT_NONE;
+		if (bStrike)
+			myInt |= FontStyleImplImmutable.FONT_STRIKETHRU;
+		if (bUnder)
+			myInt |= FontStyleImplImmutable.FONT_UNDERLINE;
+		if (bItalic)
+			myInt |= FontStyleImplImmutable.FONT_ITALIC;
+		if (bBold)
+			myInt |= FontStyleImplImmutable.FONT_BOLD;
+
+		return myInt;
+
+	}
+
 	/**
 	 * @return Returns the theColor.
 	 */
 	public Integer getColor() {
 		return theColor;
 	}
+
 	/**
 	 * @return Returns the theFlags.
 	 */
 	public int getTheFlags() {
 		return theFlags;
 	}
+
 	/**
 	 * @return Returns the theHeight.
 	 */
 	public Integer getHeight() {
 		return theHeight;
 	}
+
 	/**
 	 * @return Returns the theName.
 	 */
 	public String getName() {
 		return theName;
 	}
-	public boolean getBold()
-	{
-		return (( (getTheFlags() & FontStyleImplImmutable.FONT_BOLD)>0) ? true : false);
+
+	public boolean getBold() {
+		return (((getTheFlags() & FontStyleImplImmutable.FONT_BOLD) > 0) ? true : false);
 	}
-	public boolean getItalic()
-	{
-		return (( (getTheFlags() & FontStyleImplImmutable.FONT_ITALIC)>0) ? true : false);
+
+	public boolean getItalic() {
+		return (((getTheFlags() & FontStyleImplImmutable.FONT_ITALIC) > 0) ? true : false);
 	}
-	public boolean getUnderline()
-	{
-		return (((getTheFlags() & FontStyleImplImmutable.FONT_UNDERLINE)>0) ? true : false);
+
+	public boolean getUnderline() {
+		return (((getTheFlags() & FontStyleImplImmutable.FONT_UNDERLINE) > 0) ? true : false);
 	}
-	public boolean getStrikethru()
-	{
-		return (((getTheFlags() & FontStyleImplImmutable.FONT_STRIKETHRU)>0) ? true : false);
-	}    
-	  
+
+	public boolean getStrikethru() {
+		return (((getTheFlags() & FontStyleImplImmutable.FONT_STRIKETHRU) > 0) ? true : false);
+	}
 
 }
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/ShapeProfiler.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/ShapeProfiler.java
index f75cd73..1a092d3 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/ShapeProfiler.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/ShapeProfiler.java
@@ -13,67 +13,56 @@
 package org.eclipse.gmf.runtime.notation.stylepooling;
 
 /**
- * @author affrantz@us.ibm.com
- * used internally to probe memory usage
+ * @author affrantz@us.ibm.com used internally to probe memory usage
  */
 public class ShapeProfiler {
 
-
-    private final Runtime s_runtime = Runtime.getRuntime ();
+	private final Runtime s_runtime = Runtime.getRuntime();
 	long startMemory = 0;
 	long endMemory = 0;
 	long startTime = 0;
 	long endTime = 0;
-			
-	private long usedMemory()
-    {
-        return s_runtime.totalMemory () - s_runtime.freeMemory ();
-    }
-	private void runGC ()// throws Exception
-    {
-        // It helps to call Runtime.gc()
-		for (int r = 0; r < 4; ++ r) s_runtime.gc ();
-    }
 
-   
-	private void initProfile()
+	private long usedMemory() {
+		return s_runtime.totalMemory() - s_runtime.freeMemory();
+	}
+
+	private void runGC()// throws Exception
 	{
+		// It helps to call Runtime.gc()
+		for (int r = 0; r < 4; ++r)
+			s_runtime.gc();
+	}
+
+	private void initProfile() {
 		startMemory = 0;
 		endMemory = 0;
 		startTime = 0;
 		endTime = 0;
 	}
 
-    public void profileStart()
-	{
+	public void profileStart() {
 		initProfile();
-        runGC();
-        startMemory = usedMemory();
-        startTime = System.currentTimeMillis();
+		runGC();
+		startMemory = usedMemory();
+		startTime = System.currentTimeMillis();
 
 	}
-    public void profileEnd()
-	{
-        endTime = System.currentTimeMillis();
 
-        runGC();
-        endMemory = usedMemory();
+	public void profileEnd() {
+		endTime = System.currentTimeMillis();
+
+		runGC();
+		endMemory = usedMemory();
 
 	}
-    public void printStats()
-	{
-        long difference = ( endMemory -  startMemory );
-        long timeDiff = ( endTime -  startTime);
 
+	public void printStats() {
+		long difference = (endMemory - startMemory);
+		long timeDiff = (endTime - startTime);
 
-        System.out.println( "bytes=" + //$NON-NLS-1$
-        	difference + 
-			"	tim ms=" + timeDiff);//$NON-NLS-1$
+		System.out.println("bytes=" + //$NON-NLS-1$
+				difference + "	tim ms=" + timeDiff);//$NON-NLS-1$
 	}
 
-
-   
-
 }
-
-
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/StylePoolContainer.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/StylePoolContainer.java
index 6f0a55b..a248a89 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/StylePoolContainer.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/stylepooling/StylePoolContainer.java
@@ -14,29 +14,25 @@
 
 import java.util.HashMap;
 
-
 /**
- * The container type used by the cached styles as part of the style caching performance tuning optimization.
- * Consider having a threshold and when we reach a threshold
- * we could remove infrequently accessed styles, by ovveriding
+ * The container type used by the cached styles as part of the style caching
+ * performance tuning optimization. Consider having a threshold and when we
+ * reach a threshold we could remove infrequently accessed styles, by ovveriding
  * get to increment a cache hit cnt when get succeeds.
- *  
- * 	Remember if we are to use a weakHash the key is weak not the value.
+ * 
+ * Remember if we are to use a weakHash the key is weak not the value.
  * 
  * @author affrantz@us.ibm.com
  *
  */
 public class StylePoolContainer extends HashMap {
 
-
 	private static final long serialVersionUID = 1L;
 
-	
-	public StylePoolContainer()
-	{
+	public StylePoolContainer() {
 		super();
 	}
-	
+
 	/**
 	 * @see java.util.Map#put(java.lang.Object, java.lang.Object)
 	 */
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationAdapterFactory.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationAdapterFactory.java
index db2c4fd..d9e262c 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationAdapterFactory.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationAdapterFactory.java
@@ -19,47 +19,81 @@
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.*;
 import org.eclipse.gmf.runtime.notation.Anchor;
+import org.eclipse.gmf.runtime.notation.ArrowStyle;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.BasicDecorationNode;
+import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment;
 import org.eclipse.gmf.runtime.notation.Bendpoints;
+import org.eclipse.gmf.runtime.notation.BooleanListValueStyle;
+import org.eclipse.gmf.runtime.notation.BooleanValueStyle;
 import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.ByteArrayValueStyle;
 import org.eclipse.gmf.runtime.notation.CanonicalStyle;
+import org.eclipse.gmf.runtime.notation.Compartment;
+import org.eclipse.gmf.runtime.notation.Connector;
 import org.eclipse.gmf.runtime.notation.ConnectorStyle;
+import org.eclipse.gmf.runtime.notation.DataTypeStyle;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
 import org.eclipse.gmf.runtime.notation.DescriptionStyle;
 import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.DiagramLinkStyle;
 import org.eclipse.gmf.runtime.notation.DiagramStyle;
+import org.eclipse.gmf.runtime.notation.DoubleListValueStyle;
+import org.eclipse.gmf.runtime.notation.DoubleValueStyle;
 import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.EObjectListValueStyle;
+import org.eclipse.gmf.runtime.notation.EObjectValueStyle;
 import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.FillStyle;
 import org.eclipse.gmf.runtime.notation.FilteringStyle;
 import org.eclipse.gmf.runtime.notation.FontStyle;
 import org.eclipse.gmf.runtime.notation.Guide;
 import org.eclipse.gmf.runtime.notation.GuideStyle;
+import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
 import org.eclipse.gmf.runtime.notation.IdentityAnchor;
 import org.eclipse.gmf.runtime.notation.Image;
 import org.eclipse.gmf.runtime.notation.ImageBufferStyle;
 import org.eclipse.gmf.runtime.notation.ImageStyle;
+import org.eclipse.gmf.runtime.notation.IntListValueStyle;
+import org.eclipse.gmf.runtime.notation.IntValueStyle;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;
 import org.eclipse.gmf.runtime.notation.LineStyle;
+import org.eclipse.gmf.runtime.notation.LineTypeStyle;
+import org.eclipse.gmf.runtime.notation.ListCompartment;
+import org.eclipse.gmf.runtime.notation.ListValueStyle;
 import org.eclipse.gmf.runtime.notation.Location;
+import org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle;
+import org.eclipse.gmf.runtime.notation.NamedStyle;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.PageStyle;
+import org.eclipse.gmf.runtime.notation.PropertiesSetStyle;
+import org.eclipse.gmf.runtime.notation.PropertyValue;
 import org.eclipse.gmf.runtime.notation.Ratio;
 import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
+import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
 import org.eclipse.gmf.runtime.notation.RoutingStyle;
+import org.eclipse.gmf.runtime.notation.SemanticListCompartment;
+import org.eclipse.gmf.runtime.notation.Shape;
 import org.eclipse.gmf.runtime.notation.ShapeStyle;
+import org.eclipse.gmf.runtime.notation.SingleValueStyle;
 import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.gmf.runtime.notation.SortingStyle;
+import org.eclipse.gmf.runtime.notation.StandardDiagram;
+import org.eclipse.gmf.runtime.notation.StringListValueStyle;
+import org.eclipse.gmf.runtime.notation.StringObjectConverter;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
 import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.gmf.runtime.notation.TextStyle;
 import org.eclipse.gmf.runtime.notation.TitleStyle;
 import org.eclipse.gmf.runtime.notation.View;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
+ * an adapter <code>createXXX</code> method for each class of the model. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage
  * @generated
  */
@@ -67,18 +101,17 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class NotationAdapterFactory extends AdapterFactoryImpl {
-    /**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static NotationPackage modelPackage;
 
-    /**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotationAdapterFactory() {
@@ -87,11 +120,12 @@
 		}
 	}
 
-    /**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	/**
+	 * Returns whether this factory is applicable for the type of the object. <!--
+	 * begin-user-doc --> This implementation returns <code>true</code> if the
+	 * object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -100,256 +134,326 @@
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
 
-    /**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected NotationSwitch modelSwitch =
-        new NotationSwitch() {
-			public Object caseEdge(Edge object) {
-				return createEdgeAdapter();
-			}
-			public Object caseNode(Node object) {
-				return createNodeAdapter();
-			}
-			public Object caseStyle(Style object) {
-				return createStyleAdapter();
-			}
-			public Object caseFillStyle(FillStyle object) {
-				return createFillStyleAdapter();
-			}
-			public Object caseLineStyle(LineStyle object) {
-				return createLineStyleAdapter();
-			}
-			public Object caseFontStyle(FontStyle object) {
-				return createFontStyleAdapter();
-			}
-			public Object caseTitleStyle(TitleStyle object) {
-				return createTitleStyleAdapter();
-			}
-			public Object caseSortingStyle(SortingStyle object) {
-				return createSortingStyleAdapter();
-			}
-			public Object caseDescriptionStyle(DescriptionStyle object) {
-				return createDescriptionStyleAdapter();
-			}
-			public Object caseLayoutConstraint(LayoutConstraint object) {
-				return createLayoutConstraintAdapter();
-			}
-			public Object caseSize(Size object) {
-				return createSizeAdapter();
-			}
-			public Object caseLocation(Location object) {
-				return createLocationAdapter();
-			}
-			public Object caseBounds(Bounds object) {
-				return createBoundsAdapter();
-			}
-			public Object caseRatio(Ratio object) {
-				return createRatioAdapter();
-			}
-			public Object caseAnchor(Anchor object) {
-				return createAnchorAdapter();
-			}
-			public Object caseBendpoints(Bendpoints object) {
-				return createBendpointsAdapter();
-			}
-			public Object caseIdentityAnchor(IdentityAnchor object) {
-				return createIdentityAnchorAdapter();
-			}
-			public Object caseRoutingStyle(RoutingStyle object) {
-				return createRoutingStyleAdapter();
-			}
-			public Object caseView(View object) {
-				return createViewAdapter();
-			}
-			public Object caseRelativeBendpoints(RelativeBendpoints object) {
-				return createRelativeBendpointsAdapter();
-			}
-			public Object caseDiagram(Diagram object) {
-				return createDiagramAdapter();
-			}
-			public Object caseImage(Image object) {
-				return createImageAdapter();
-			}
-			public Object caseCanonicalStyle(CanonicalStyle object) {
-				return createCanonicalStyleAdapter();
-			}
-			public Object caseShapeStyle(ShapeStyle object) {
-				return createShapeStyleAdapter();
-			}
-			public Object caseConnectorStyle(ConnectorStyle object) {
-				return createConnectorStyleAdapter();
-			}
-			public Object casePageStyle(PageStyle object) {
-				return createPageStyleAdapter();
-			}
-			public Object caseDrawerStyle(DrawerStyle object) {
-				return createDrawerStyleAdapter();
-			}
-			public Object caseGuideStyle(GuideStyle object) {
-				return createGuideStyleAdapter();
-			}
-			public Object caseGuide(Guide object) {
-				return createGuideAdapter();
-			}
-			public Object caseNodeEntry(Map.Entry object) {
-				return createNodeEntryAdapter();
-			}
-			public Object caseFilteringStyle(FilteringStyle object) {
-				return createFilteringStyleAdapter();
-			}
-			public Object caseDiagramStyle(DiagramStyle object) {
-				return createDiagramStyleAdapter();
-			}
-			public Object caseImageStyle(ImageStyle object) {
-				return createImageStyleAdapter();
-			}
-			public Object caseImageBufferStyle(ImageBufferStyle object) {
-				return createImageBufferStyleAdapter();
-			}
-			public Object casePropertiesSetStyle(PropertiesSetStyle object) {
-				return createPropertiesSetStyleAdapter();
-			}
-			public Object caseStringToPropertyValueMapEntry(Map.Entry object) {
-				return createStringToPropertyValueMapEntryAdapter();
-			}
-			public Object casePropertyValue(PropertyValue object) {
-				return createPropertyValueAdapter();
-			}
-			public Object caseSingleValueStyle(SingleValueStyle object) {
-				return createSingleValueStyleAdapter();
-			}
-			public Object caseListValueStyle(ListValueStyle object) {
-				return createListValueStyleAdapter();
-			}
-			public Object caseNamedStyle(NamedStyle object) {
-				return createNamedStyleAdapter();
-			}
-			public Object caseStringObjectConverter(StringObjectConverter object) {
-				return createStringObjectConverterAdapter();
-			}
-			public Object caseDataTypeStyle(DataTypeStyle object) {
-				return createDataTypeStyleAdapter();
-			}
-			public Object caseIntValueStyle(IntValueStyle object) {
-				return createIntValueStyleAdapter();
-			}
-			public Object caseIntListValueStyle(IntListValueStyle object) {
-				return createIntListValueStyleAdapter();
-			}
-			public Object caseBooleanValueStyle(BooleanValueStyle object) {
-				return createBooleanValueStyleAdapter();
-			}
-			public Object caseDoubleValueStyle(DoubleValueStyle object) {
-				return createDoubleValueStyleAdapter();
-			}
-			public Object caseDoubleListValueStyle(DoubleListValueStyle object) {
-				return createDoubleListValueStyleAdapter();
-			}
-			public Object caseStringValueStyle(StringValueStyle object) {
-				return createStringValueStyleAdapter();
-			}
-			public Object caseStringListValueStyle(StringListValueStyle object) {
-				return createStringListValueStyleAdapter();
-			}
-			public Object caseEObjectValueStyle(EObjectValueStyle object) {
-				return createEObjectValueStyleAdapter();
-			}
-			public Object caseEObjectListValueStyle(EObjectListValueStyle object) {
-				return createEObjectListValueStyleAdapter();
-			}
-			public Object caseByteArrayValueStyle(ByteArrayValueStyle object) {
-				return createByteArrayValueStyleAdapter();
-			}
-			public Object caseBooleanListValueStyle(BooleanListValueStyle object) {
-				return createBooleanListValueStyleAdapter();
-			}
-			public Object caseHintedDiagramLinkStyle(HintedDiagramLinkStyle object) {
-				return createHintedDiagramLinkStyleAdapter();
-			}
-			public Object caseDiagramLinkStyle(DiagramLinkStyle object) {
-				return createDiagramLinkStyleAdapter();
-			}
-			public Object caseMultiDiagramLinkStyle(MultiDiagramLinkStyle object) {
-				return createMultiDiagramLinkStyleAdapter();
-			}
-			public Object caseTextStyle(TextStyle object) {
-				return createTextStyleAdapter();
-			}
-			public Object caseLineTypeStyle(LineTypeStyle object) {
-				return createLineTypeStyleAdapter();
-			}
-			public Object caseArrowStyle(ArrowStyle object) {
-				return createArrowStyleAdapter();
-			}
-			public Object caseShape(Shape object) {
-				return createShapeAdapter();
-			}
-			public Object caseCompartment(Compartment object) {
-				return createCompartmentAdapter();
-			}
-			public Object caseListCompartment(ListCompartment object) {
-				return createListCompartmentAdapter();
-			}
-			public Object caseConnector(Connector object) {
-				return createConnectorAdapter();
-			}
-			public Object caseStandardDiagram(StandardDiagram object) {
-				return createStandardDiagramAdapter();
-			}
-			public Object caseDecorationNode(DecorationNode object) {
-				return createDecorationNodeAdapter();
-			}
-			public Object caseBasicDecorationNode(BasicDecorationNode object) {
-				return createBasicDecorationNodeAdapter();
-			}
-			public Object caseBasicCompartment(BasicCompartment object) {
-				return createBasicCompartmentAdapter();
-			}
-			public Object caseBasicSemanticCompartment(BasicSemanticCompartment object) {
-				return createBasicSemanticCompartmentAdapter();
-			}
-			public Object caseSemanticListCompartment(SemanticListCompartment object) {
-				return createSemanticListCompartmentAdapter();
-			}
-			public Object caseRoundedCornersStyle(RoundedCornersStyle object) {
-				return createRoundedCornersStyleAdapter();
-			}
-			public Object caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected NotationSwitch modelSwitch = new NotationSwitch() {
+		public Object caseEdge(Edge object) {
+			return createEdgeAdapter();
+		}
 
-    /**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+		public Object caseNode(Node object) {
+			return createNodeAdapter();
+		}
+
+		public Object caseStyle(Style object) {
+			return createStyleAdapter();
+		}
+
+		public Object caseFillStyle(FillStyle object) {
+			return createFillStyleAdapter();
+		}
+
+		public Object caseLineStyle(LineStyle object) {
+			return createLineStyleAdapter();
+		}
+
+		public Object caseFontStyle(FontStyle object) {
+			return createFontStyleAdapter();
+		}
+
+		public Object caseTitleStyle(TitleStyle object) {
+			return createTitleStyleAdapter();
+		}
+
+		public Object caseSortingStyle(SortingStyle object) {
+			return createSortingStyleAdapter();
+		}
+
+		public Object caseDescriptionStyle(DescriptionStyle object) {
+			return createDescriptionStyleAdapter();
+		}
+
+		public Object caseLayoutConstraint(LayoutConstraint object) {
+			return createLayoutConstraintAdapter();
+		}
+
+		public Object caseSize(Size object) {
+			return createSizeAdapter();
+		}
+
+		public Object caseLocation(Location object) {
+			return createLocationAdapter();
+		}
+
+		public Object caseBounds(Bounds object) {
+			return createBoundsAdapter();
+		}
+
+		public Object caseRatio(Ratio object) {
+			return createRatioAdapter();
+		}
+
+		public Object caseAnchor(Anchor object) {
+			return createAnchorAdapter();
+		}
+
+		public Object caseBendpoints(Bendpoints object) {
+			return createBendpointsAdapter();
+		}
+
+		public Object caseIdentityAnchor(IdentityAnchor object) {
+			return createIdentityAnchorAdapter();
+		}
+
+		public Object caseRoutingStyle(RoutingStyle object) {
+			return createRoutingStyleAdapter();
+		}
+
+		public Object caseView(View object) {
+			return createViewAdapter();
+		}
+
+		public Object caseRelativeBendpoints(RelativeBendpoints object) {
+			return createRelativeBendpointsAdapter();
+		}
+
+		public Object caseDiagram(Diagram object) {
+			return createDiagramAdapter();
+		}
+
+		public Object caseImage(Image object) {
+			return createImageAdapter();
+		}
+
+		public Object caseCanonicalStyle(CanonicalStyle object) {
+			return createCanonicalStyleAdapter();
+		}
+
+		public Object caseShapeStyle(ShapeStyle object) {
+			return createShapeStyleAdapter();
+		}
+
+		public Object caseConnectorStyle(ConnectorStyle object) {
+			return createConnectorStyleAdapter();
+		}
+
+		public Object casePageStyle(PageStyle object) {
+			return createPageStyleAdapter();
+		}
+
+		public Object caseDrawerStyle(DrawerStyle object) {
+			return createDrawerStyleAdapter();
+		}
+
+		public Object caseGuideStyle(GuideStyle object) {
+			return createGuideStyleAdapter();
+		}
+
+		public Object caseGuide(Guide object) {
+			return createGuideAdapter();
+		}
+
+		public Object caseNodeEntry(Map.Entry object) {
+			return createNodeEntryAdapter();
+		}
+
+		public Object caseFilteringStyle(FilteringStyle object) {
+			return createFilteringStyleAdapter();
+		}
+
+		public Object caseDiagramStyle(DiagramStyle object) {
+			return createDiagramStyleAdapter();
+		}
+
+		public Object caseImageStyle(ImageStyle object) {
+			return createImageStyleAdapter();
+		}
+
+		public Object caseImageBufferStyle(ImageBufferStyle object) {
+			return createImageBufferStyleAdapter();
+		}
+
+		public Object casePropertiesSetStyle(PropertiesSetStyle object) {
+			return createPropertiesSetStyleAdapter();
+		}
+
+		public Object caseStringToPropertyValueMapEntry(Map.Entry object) {
+			return createStringToPropertyValueMapEntryAdapter();
+		}
+
+		public Object casePropertyValue(PropertyValue object) {
+			return createPropertyValueAdapter();
+		}
+
+		public Object caseSingleValueStyle(SingleValueStyle object) {
+			return createSingleValueStyleAdapter();
+		}
+
+		public Object caseListValueStyle(ListValueStyle object) {
+			return createListValueStyleAdapter();
+		}
+
+		public Object caseNamedStyle(NamedStyle object) {
+			return createNamedStyleAdapter();
+		}
+
+		public Object caseStringObjectConverter(StringObjectConverter object) {
+			return createStringObjectConverterAdapter();
+		}
+
+		public Object caseDataTypeStyle(DataTypeStyle object) {
+			return createDataTypeStyleAdapter();
+		}
+
+		public Object caseIntValueStyle(IntValueStyle object) {
+			return createIntValueStyleAdapter();
+		}
+
+		public Object caseIntListValueStyle(IntListValueStyle object) {
+			return createIntListValueStyleAdapter();
+		}
+
+		public Object caseBooleanValueStyle(BooleanValueStyle object) {
+			return createBooleanValueStyleAdapter();
+		}
+
+		public Object caseDoubleValueStyle(DoubleValueStyle object) {
+			return createDoubleValueStyleAdapter();
+		}
+
+		public Object caseDoubleListValueStyle(DoubleListValueStyle object) {
+			return createDoubleListValueStyleAdapter();
+		}
+
+		public Object caseStringValueStyle(StringValueStyle object) {
+			return createStringValueStyleAdapter();
+		}
+
+		public Object caseStringListValueStyle(StringListValueStyle object) {
+			return createStringListValueStyleAdapter();
+		}
+
+		public Object caseEObjectValueStyle(EObjectValueStyle object) {
+			return createEObjectValueStyleAdapter();
+		}
+
+		public Object caseEObjectListValueStyle(EObjectListValueStyle object) {
+			return createEObjectListValueStyleAdapter();
+		}
+
+		public Object caseByteArrayValueStyle(ByteArrayValueStyle object) {
+			return createByteArrayValueStyleAdapter();
+		}
+
+		public Object caseBooleanListValueStyle(BooleanListValueStyle object) {
+			return createBooleanListValueStyleAdapter();
+		}
+
+		public Object caseHintedDiagramLinkStyle(HintedDiagramLinkStyle object) {
+			return createHintedDiagramLinkStyleAdapter();
+		}
+
+		public Object caseDiagramLinkStyle(DiagramLinkStyle object) {
+			return createDiagramLinkStyleAdapter();
+		}
+
+		public Object caseMultiDiagramLinkStyle(MultiDiagramLinkStyle object) {
+			return createMultiDiagramLinkStyleAdapter();
+		}
+
+		public Object caseTextStyle(TextStyle object) {
+			return createTextStyleAdapter();
+		}
+
+		public Object caseLineTypeStyle(LineTypeStyle object) {
+			return createLineTypeStyleAdapter();
+		}
+
+		public Object caseArrowStyle(ArrowStyle object) {
+			return createArrowStyleAdapter();
+		}
+
+		public Object caseShape(Shape object) {
+			return createShapeAdapter();
+		}
+
+		public Object caseCompartment(Compartment object) {
+			return createCompartmentAdapter();
+		}
+
+		public Object caseListCompartment(ListCompartment object) {
+			return createListCompartmentAdapter();
+		}
+
+		public Object caseConnector(Connector object) {
+			return createConnectorAdapter();
+		}
+
+		public Object caseStandardDiagram(StandardDiagram object) {
+			return createStandardDiagramAdapter();
+		}
+
+		public Object caseDecorationNode(DecorationNode object) {
+			return createDecorationNodeAdapter();
+		}
+
+		public Object caseBasicDecorationNode(BasicDecorationNode object) {
+			return createBasicDecorationNodeAdapter();
+		}
+
+		public Object caseBasicCompartment(BasicCompartment object) {
+			return createBasicCompartmentAdapter();
+		}
+
+		public Object caseBasicSemanticCompartment(BasicSemanticCompartment object) {
+			return createBasicSemanticCompartmentAdapter();
+		}
+
+		public Object caseSemanticListCompartment(SemanticListCompartment object) {
+			return createSemanticListCompartmentAdapter();
+		}
+
+		public Object caseRoundedCornersStyle(RoundedCornersStyle object) {
+			return createRoundedCornersStyleAdapter();
+		}
+
+		public Object caseEModelElement(EModelElement object) {
+			return createEModelElementAdapter();
+		}
+
+		public Object defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
+
+	/**
+	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
+		return (Adapter) modelSwitch.doSwitch((EObject) target);
 	}
 
-
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Edge <em>Edge</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Edge <em>Edge</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Edge
 	 * @generated
@@ -358,12 +462,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Node <em>Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Node <em>Node</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Node
 	 * @generated
@@ -372,12 +477,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Style
 	 * @generated
@@ -386,12 +492,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.FillStyle <em>Fill Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.FillStyle <em>Fill Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.FillStyle
 	 * @generated
@@ -400,12 +507,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.LineStyle <em>Line Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.LineStyle <em>Line Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.LineStyle
 	 * @generated
@@ -414,12 +522,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.FontStyle <em>Font Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.FontStyle <em>Font Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.FontStyle
 	 * @generated
@@ -428,12 +537,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.TitleStyle <em>Title Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.TitleStyle <em>Title Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.TitleStyle
 	 * @generated
@@ -442,12 +552,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.SortingStyle <em>Sorting Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.SortingStyle <em>Sorting
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.SortingStyle
 	 * @generated
@@ -456,12 +567,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle <em>Description Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.DescriptionStyle <em>Description
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.DescriptionStyle
 	 * @generated
@@ -470,12 +582,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.LayoutConstraint <em>Layout Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.LayoutConstraint <em>Layout
+	 * Constraint</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.LayoutConstraint
 	 * @generated
@@ -484,12 +597,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Size <em>Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Size <em>Size</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Size
 	 * @generated
@@ -498,12 +612,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Location <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Location <em>Location</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Location
 	 * @generated
@@ -512,12 +627,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Bounds <em>Bounds</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Bounds <em>Bounds</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Bounds
 	 * @generated
@@ -526,12 +642,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Ratio <em>Ratio</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Ratio <em>Ratio</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Ratio
 	 * @generated
@@ -540,12 +657,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Anchor <em>Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Anchor <em>Anchor</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Anchor
 	 * @generated
@@ -554,12 +672,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Bendpoints <em>Bendpoints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Bendpoints <em>Bendpoints</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Bendpoints
 	 * @generated
@@ -568,12 +687,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.IdentityAnchor <em>Identity Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.IdentityAnchor <em>Identity
+	 * Anchor</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.IdentityAnchor
 	 * @generated
@@ -582,12 +702,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.RoutingStyle <em>Routing Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.RoutingStyle <em>Routing
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.RoutingStyle
 	 * @generated
@@ -596,12 +717,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.View <em>View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.View <em>View</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.View
 	 * @generated
@@ -610,12 +732,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints <em>Relative Bendpoints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.RelativeBendpoints <em>Relative
+	 * Bendpoints</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.RelativeBendpoints
 	 * @generated
@@ -624,12 +747,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle <em>Canonical Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.CanonicalStyle <em>Canonical
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.CanonicalStyle
 	 * @generated
@@ -638,12 +762,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ShapeStyle <em>Shape Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.ShapeStyle <em>Shape Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.ShapeStyle
 	 * @generated
@@ -652,12 +777,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ConnectorStyle <em>Connector Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.ConnectorStyle <em>Connector
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.ConnectorStyle
 	 * @generated
@@ -666,12 +792,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Diagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Diagram <em>Diagram</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Diagram
 	 * @generated
@@ -680,12 +807,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Image <em>Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Image <em>Image</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Image
 	 * @generated
@@ -694,12 +822,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.PageStyle <em>Page Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.PageStyle <em>Page Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.PageStyle
 	 * @generated
@@ -708,12 +837,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DrawerStyle <em>Drawer Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.DrawerStyle <em>Drawer Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.DrawerStyle
 	 * @generated
@@ -722,12 +852,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.GuideStyle <em>Guide Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.GuideStyle <em>Guide Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.GuideStyle
 	 * @generated
@@ -736,12 +867,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Guide <em>Guide</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Guide <em>Guide</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Guide
 	 * @generated
@@ -750,12 +882,12 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Node Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+	 * <em>Node Entry</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see java.util.Map.Entry
 	 * @generated
@@ -764,12 +896,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.FilteringStyle <em>Filtering Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.FilteringStyle <em>Filtering
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.FilteringStyle
 	 * @generated
@@ -778,12 +911,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DiagramStyle <em>Diagram Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.DiagramStyle <em>Diagram
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.DiagramStyle
 	 * @generated
@@ -792,12 +926,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ImageStyle <em>Image Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageStyle <em>Image Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.ImageStyle
 	 * @generated
@@ -806,12 +941,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle <em>Image Buffer Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.ImageBufferStyle <em>Image Buffer
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.ImageBufferStyle
 	 * @generated
@@ -820,12 +956,13 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle <em>Properties Set Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertiesSetStyle <em>Properties
+	 * Set Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.PropertiesSetStyle
 	 * @generated
@@ -834,12 +971,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Property Value Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	/**
+	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+	 * <em>String To Property Value Map Entry</em>}'. <!-- begin-user-doc --> This
+	 * default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see java.util.Map.Entry
 	 * @generated
@@ -848,12 +986,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.PropertyValue <em>Property Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.PropertyValue <em>Property
+	 * Value</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.PropertyValue
 	 * @generated
@@ -862,12 +1001,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.SingleValueStyle <em>Single Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.SingleValueStyle <em>Single Value
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.SingleValueStyle
 	 * @generated
@@ -876,12 +1016,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ListValueStyle <em>List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.ListValueStyle <em>List Value
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.ListValueStyle
 	 * @generated
@@ -890,12 +1031,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.NamedStyle <em>Named Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.NamedStyle <em>Named Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.NamedStyle
 	 * @generated
@@ -904,12 +1046,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.StringObjectConverter <em>String Object Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.StringObjectConverter <em>String
+	 * Object Converter</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.StringObjectConverter
 	 * @generated
@@ -918,12 +1061,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DataTypeStyle <em>Data Type Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.DataTypeStyle <em>Data Type
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.DataTypeStyle
 	 * @generated
@@ -932,12 +1076,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.IntValueStyle <em>Int Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.IntValueStyle <em>Int Value
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.IntValueStyle
 	 * @generated
@@ -946,12 +1091,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.IntListValueStyle <em>Int List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.IntListValueStyle <em>Int List Value
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.IntListValueStyle
 	 * @generated
@@ -960,12 +1106,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle <em>Boolean Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.BooleanValueStyle <em>Boolean Value
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.BooleanValueStyle
 	 * @generated
@@ -974,12 +1121,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle <em>Double Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.DoubleValueStyle <em>Double Value
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.DoubleValueStyle
 	 * @generated
@@ -988,12 +1136,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle <em>Double List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.DoubleListValueStyle <em>Double List
+	 * Value Style</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.DoubleListValueStyle
 	 * @generated
@@ -1002,12 +1151,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.StringValueStyle <em>String Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.StringValueStyle <em>String Value
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.StringValueStyle
 	 * @generated
@@ -1016,12 +1166,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.StringListValueStyle <em>String List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.StringListValueStyle <em>String List
+	 * Value Style</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.StringListValueStyle
 	 * @generated
@@ -1030,12 +1181,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle <em>EObject Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.EObjectValueStyle <em>EObject Value
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.EObjectValueStyle
 	 * @generated
@@ -1044,12 +1196,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle <em>EObject List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.EObjectListValueStyle <em>EObject
+	 * List Value Style</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.EObjectListValueStyle
 	 * @generated
@@ -1058,12 +1211,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle <em>Byte Array Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.ByteArrayValueStyle <em>Byte Array
+	 * Value Style</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.ByteArrayValueStyle
 	 * @generated
@@ -1072,12 +1226,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle <em>Boolean List Value Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.BooleanListValueStyle <em>Boolean
+	 * List Value Style</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.BooleanListValueStyle
 	 * @generated
@@ -1086,12 +1241,14 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle <em>Hinted Diagram Link Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle <em>Hinted
+	 * Diagram Link Style</em>}'. <!-- begin-user-doc --> This default
+	 * implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle
 	 * @generated
@@ -1100,12 +1257,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle <em>Diagram Link Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.DiagramLinkStyle <em>Diagram Link
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.DiagramLinkStyle
 	 * @generated
@@ -1114,12 +1272,14 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle <em>Multi Diagram Link Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle <em>Multi
+	 * Diagram Link Style</em>}'. <!-- begin-user-doc --> This default
+	 * implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle
 	 * @generated
@@ -1128,12 +1288,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.TextStyle <em>Text Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.TextStyle <em>Text Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.TextStyle
 	 * @generated
@@ -1142,12 +1303,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.LineTypeStyle <em>Line Type Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.LineTypeStyle <em>Line Type
+	 * Style</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.LineTypeStyle
 	 * @generated
@@ -1156,12 +1318,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ArrowStyle <em>Arrow Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.ArrowStyle <em>Arrow Style</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.ArrowStyle
 	 * @generated
@@ -1170,12 +1333,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Shape <em>Shape</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Shape <em>Shape</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Shape
 	 * @generated
@@ -1185,12 +1349,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Compartment <em>Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Compartment <em>Compartment</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we
+	 * can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Compartment
 	 * @generated
@@ -1200,12 +1365,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.ListCompartment <em>List Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.ListCompartment <em>List
+	 * Compartment</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.ListCompartment
 	 * @generated
@@ -1215,12 +1381,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Connector <em>Connector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.Connector <em>Connector</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.Connector
 	 * @generated
@@ -1230,12 +1397,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.StandardDiagram <em>Standard Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.StandardDiagram <em>Standard
+	 * Diagram</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.StandardDiagram
 	 * @generated
@@ -1245,12 +1413,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.DecorationNode <em>Decoration Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.DecorationNode <em>Decoration
+	 * Node</em>}'. <!-- begin-user-doc --> This default implementation returns null
+	 * so that we can easily ignore cases; it's useful to ignore a case when
+	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.DecorationNode
 	 * @generated
@@ -1260,12 +1429,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BasicDecorationNode <em>Basic Decoration Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.BasicDecorationNode <em>Basic
+	 * Decoration Node</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.BasicDecorationNode
 	 * @generated
@@ -1275,12 +1445,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BasicCompartment <em>Basic Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.BasicCompartment <em>Basic
+	 * Compartment</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.BasicCompartment
 	 * @generated
@@ -1290,12 +1461,14 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.BasicSemanticCompartment <em>Basic Semantic Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.BasicSemanticCompartment <em>Basic
+	 * Semantic Compartment</em>}'. <!-- begin-user-doc --> This default
+	 * implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.BasicSemanticCompartment
 	 * @generated
@@ -1305,12 +1478,13 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.SemanticListCompartment <em>Semantic List Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.SemanticListCompartment <em>Semantic
+	 * List Compartment</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.SemanticListCompartment
 	 * @generated
@@ -1320,27 +1494,29 @@
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle <em>Rounded Corners Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.gmf.runtime.notation.RoundedCornersStyle <em>Rounded
+	 * Corners Style</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case
+	 * when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.gmf.runtime.notation.RoundedCornersStyle
 	 * @generated
-     * @since 1.4
+	 * @since 1.4
 	 */
 	public Adapter createRoundedCornersStyleAdapter() {
 		return null;
 	}
 
-				/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.ecore.EModelElement
 	 * @generated
@@ -1349,11 +1525,10 @@
 		return null;
 	}
 
-    /**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This
+	 * default implementation returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -1361,4 +1536,4 @@
 		return null;
 	}
 
-} //NotationAdapterFactory
+} // NotationAdapterFactory
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationExtendedMetaData.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationExtendedMetaData.java
index 95d258f..a499661 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationExtendedMetaData.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationExtendedMetaData.java
@@ -19,13 +19,11 @@
 import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 
-
 /**
  * A special NotationExtendedMetaData class that will allow one to load
- *  resources that came from previous versions of the notation metamodel.
+ * resources that came from previous versions of the notation metamodel.
  */
-public class NotationExtendedMetaData
-	extends BasicExtendedMetaData {
+public class NotationExtendedMetaData extends BasicExtendedMetaData {
 
 	private static final Set notationNSURIs = new HashSet();
 	static {
@@ -34,12 +32,12 @@
 		notationNSURIs.add("http://www.eclipse.org/gmf/1.5.1/Notation"); //$NON-NLS-1$
 		notationNSURIs.add("http://www.ibm.com/xtools/1.5.1/Notation"); //$NON-NLS-1$
 	}
-	
+
 	public EPackage getPackage(String namespace) {
 		if (notationNSURIs.contains(namespace)) {
 			return NotationPackage.eINSTANCE;
 		}
-		
+
 		return super.getPackage(namespace);
 	}
 }
diff --git a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationSwitch.java b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationSwitch.java
index 31688ba..8c84985 100644
--- a/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationSwitch.java
+++ b/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationSwitch.java
@@ -18,52 +18,84 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.*;
 import org.eclipse.gmf.runtime.notation.Anchor;
+import org.eclipse.gmf.runtime.notation.ArrowStyle;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.BasicDecorationNode;
+import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment;
 import org.eclipse.gmf.runtime.notation.Bendpoints;
+import org.eclipse.gmf.runtime.notation.BooleanListValueStyle;
+import org.eclipse.gmf.runtime.notation.BooleanValueStyle;
 import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.ByteArrayValueStyle;
 import org.eclipse.gmf.runtime.notation.CanonicalStyle;
+import org.eclipse.gmf.runtime.notation.Compartment;
+import org.eclipse.gmf.runtime.notation.Connector;
 import org.eclipse.gmf.runtime.notation.ConnectorStyle;
+import org.eclipse.gmf.runtime.notation.DataTypeStyle;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
 import org.eclipse.gmf.runtime.notation.DescriptionStyle;
 import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.DiagramLinkStyle;
 import org.eclipse.gmf.runtime.notation.DiagramStyle;
+import org.eclipse.gmf.runtime.notation.DoubleListValueStyle;
+import org.eclipse.gmf.runtime.notation.DoubleValueStyle;
 import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.EObjectListValueStyle;
+import org.eclipse.gmf.runtime.notation.EObjectValueStyle;
 import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.FillStyle;
 import org.eclipse.gmf.runtime.notation.FilteringStyle;
 import org.eclipse.gmf.runtime.notation.FontStyle;
 import org.eclipse.gmf.runtime.notation.Guide;
 import org.eclipse.gmf.runtime.notation.GuideStyle;
+import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
 import org.eclipse.gmf.runtime.notation.IdentityAnchor;
 import org.eclipse.gmf.runtime.notation.Image;
 import org.eclipse.gmf.runtime.notation.ImageBufferStyle;
 import org.eclipse.gmf.runtime.notation.ImageStyle;
+import org.eclipse.gmf.runtime.notation.IntListValueStyle;
+import org.eclipse.gmf.runtime.notation.IntValueStyle;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;
 import org.eclipse.gmf.runtime.notation.LineStyle;
+import org.eclipse.gmf.runtime.notation.LineTypeStyle;
+import org.eclipse.gmf.runtime.notation.ListCompartment;
+import org.eclipse.gmf.runtime.notation.ListValueStyle;
 import org.eclipse.gmf.runtime.notation.Location;
+import org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle;
+import org.eclipse.gmf.runtime.notation.NamedStyle;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.PageStyle;
+import org.eclipse.gmf.runtime.notation.PropertiesSetStyle;
+import org.eclipse.gmf.runtime.notation.PropertyValue;
 import org.eclipse.gmf.runtime.notation.Ratio;
 import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
+import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
 import org.eclipse.gmf.runtime.notation.RoutingStyle;
+import org.eclipse.gmf.runtime.notation.SemanticListCompartment;
+import org.eclipse.gmf.runtime.notation.Shape;
 import org.eclipse.gmf.runtime.notation.ShapeStyle;
+import org.eclipse.gmf.runtime.notation.SingleValueStyle;
 import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.gmf.runtime.notation.SortingStyle;
+import org.eclipse.gmf.runtime.notation.StandardDiagram;
+import org.eclipse.gmf.runtime.notation.StringListValueStyle;
+import org.eclipse.gmf.runtime.notation.StringObjectConverter;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
 import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.gmf.runtime.notation.TextStyle;
 import org.eclipse.gmf.runtime.notation.TitleStyle;
 import org.eclipse.gmf.runtime.notation.View;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
+ * hierarchy. It supports the call {@link #doSwitch doSwitch(object)} to invoke
+ * the <code>caseXXX</code> method for each class of the model, starting with
+ * the actual class of the object and proceeding up the inheritance hierarchy
+ * until a non-null result is returned, which is the result of the switch. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.gmf.runtime.notation.NotationPackage
  * @generated
  */
@@ -71,18 +103,17 @@
  * @canBeSeenBy org.eclipse.gmf.runtime.notation.*
  */
 public class NotationSwitch {
-    /**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static NotationPackage modelPackage;
 
-    /**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	public NotationSwitch() {
@@ -91,10 +122,11 @@
 		}
 	}
 
-    /**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a
+	 * non null result; it yields that result. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -102,634 +134,870 @@
 		return doSwitch(theEObject.eClass(), theEObject);
 	}
 
-    /**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a
+	 * non null result; it yields that result. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected Object doSwitch(EClass theEClass, EObject theEObject) {
 		if (theEClass.eContainer() == modelPackage) {
 			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
+		} else {
 			List eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
+			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch((EClass) eSuperTypes.get(0), theEObject);
 		}
 	}
 
-    /**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a
+	 * non null result; it yields that result. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected Object doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case NotationPackage.EDGE: {
-				Edge edge = (Edge)theEObject;
-				Object result = caseEdge(edge);
-				if (result == null) result = caseView(edge);
-				if (result == null) result = caseEModelElement(edge);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.NODE: {
-				Node node = (Node)theEObject;
-				Object result = caseNode(node);
-				if (result == null) result = caseView(node);
-				if (result == null) result = caseEModelElement(node);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.STYLE: {
-				Style style = (Style)theEObject;
-				Object result = caseStyle(style);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.FILL_STYLE: {
-				FillStyle fillStyle = (FillStyle)theEObject;
-				Object result = caseFillStyle(fillStyle);
-				if (result == null) result = caseStyle(fillStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.LINE_STYLE: {
-				LineStyle lineStyle = (LineStyle)theEObject;
-				Object result = caseLineStyle(lineStyle);
-				if (result == null) result = caseStyle(lineStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.FONT_STYLE: {
-				FontStyle fontStyle = (FontStyle)theEObject;
-				Object result = caseFontStyle(fontStyle);
-				if (result == null) result = caseStyle(fontStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.TITLE_STYLE: {
-				TitleStyle titleStyle = (TitleStyle)theEObject;
-				Object result = caseTitleStyle(titleStyle);
-				if (result == null) result = caseStyle(titleStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.SORTING_STYLE: {
-				SortingStyle sortingStyle = (SortingStyle)theEObject;
-				Object result = caseSortingStyle(sortingStyle);
-				if (result == null) result = caseStyle(sortingStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DESCRIPTION_STYLE: {
-				DescriptionStyle descriptionStyle = (DescriptionStyle)theEObject;
-				Object result = caseDescriptionStyle(descriptionStyle);
-				if (result == null) result = caseStyle(descriptionStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.LAYOUT_CONSTRAINT: {
-				LayoutConstraint layoutConstraint = (LayoutConstraint)theEObject;
-				Object result = caseLayoutConstraint(layoutConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.SIZE: {
-				Size size = (Size)theEObject;
-				Object result = caseSize(size);
-				if (result == null) result = caseLayoutConstraint(size);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.LOCATION: {
-				Location location = (Location)theEObject;
-				Object result = caseLocation(location);
-				if (result == null) result = caseLayoutConstraint(location);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.BOUNDS: {
-				Bounds bounds = (Bounds)theEObject;
-				Object result = caseBounds(bounds);
-				if (result == null) result = caseLocation(bounds);
-				if (result == null) result = caseSize(bounds);
-				if (result == null) result = caseLayoutConstraint(bounds);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.RATIO: {
-				Ratio ratio = (Ratio)theEObject;
-				Object result = caseRatio(ratio);
-				if (result == null) result = caseLayoutConstraint(ratio);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.ANCHOR: {
-				Anchor anchor = (Anchor)theEObject;
-				Object result = caseAnchor(anchor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.BENDPOINTS: {
-				Bendpoints bendpoints = (Bendpoints)theEObject;
-				Object result = caseBendpoints(bendpoints);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.IDENTITY_ANCHOR: {
-				IdentityAnchor identityAnchor = (IdentityAnchor)theEObject;
-				Object result = caseIdentityAnchor(identityAnchor);
-				if (result == null) result = caseAnchor(identityAnchor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.ROUTING_STYLE: {
-				RoutingStyle routingStyle = (RoutingStyle)theEObject;
-				Object result = caseRoutingStyle(routingStyle);
-				if (result == null) result = caseRoundedCornersStyle(routingStyle);
-				if (result == null) result = caseStyle(routingStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.VIEW: {
-				View view = (View)theEObject;
-				Object result = caseView(view);
-				if (result == null) result = caseEModelElement(view);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.RELATIVE_BENDPOINTS: {
-				RelativeBendpoints relativeBendpoints = (RelativeBendpoints)theEObject;
-				Object result = caseRelativeBendpoints(relativeBendpoints);
-				if (result == null) result = caseBendpoints(relativeBendpoints);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DIAGRAM: {
-				Diagram diagram = (Diagram)theEObject;
-				Object result = caseDiagram(diagram);
-				if (result == null) result = caseView(diagram);
-				if (result == null) result = caseEModelElement(diagram);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.IMAGE: {
-				Image image = (Image)theEObject;
-				Object result = caseImage(image);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.CANONICAL_STYLE: {
-				CanonicalStyle canonicalStyle = (CanonicalStyle)theEObject;
-				Object result = caseCanonicalStyle(canonicalStyle);
-				if (result == null) result = caseStyle(canonicalStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.SHAPE_STYLE: {
-				ShapeStyle shapeStyle = (ShapeStyle)theEObject;
-				Object result = caseShapeStyle(shapeStyle);
-				if (result == null) result = caseFontStyle(shapeStyle);
-				if (result == null) result = caseDescriptionStyle(shapeStyle);
-				if (result == null) result = caseFillStyle(shapeStyle);
-				if (result == null) result = caseLineStyle(shapeStyle);
-				if (result == null) result = caseRoundedCornersStyle(shapeStyle);
-				if (result == null) result = caseStyle(shapeStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.CONNECTOR_STYLE: {
-				ConnectorStyle connectorStyle = (ConnectorStyle)theEObject;
-				Object result = caseConnectorStyle(connectorStyle);
-				if (result == null) result = caseRoutingStyle(connectorStyle);
-				if (result == null) result = caseLineStyle(connectorStyle);
-				if (result == null) result = caseRoundedCornersStyle(connectorStyle);
-				if (result == null) result = caseStyle(connectorStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.PAGE_STYLE: {
-				PageStyle pageStyle = (PageStyle)theEObject;
-				Object result = casePageStyle(pageStyle);
-				if (result == null) result = caseStyle(pageStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DRAWER_STYLE: {
-				DrawerStyle drawerStyle = (DrawerStyle)theEObject;
-				Object result = caseDrawerStyle(drawerStyle);
-				if (result == null) result = caseStyle(drawerStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.GUIDE_STYLE: {
-				GuideStyle guideStyle = (GuideStyle)theEObject;
-				Object result = caseGuideStyle(guideStyle);
-				if (result == null) result = caseStyle(guideStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.GUIDE: {
-				Guide guide = (Guide)theEObject;
-				Object result = caseGuide(guide);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.NODE_ENTRY: {
-				Map.Entry nodeEntry = (Map.Entry)theEObject;
-				Object result = caseNodeEntry(nodeEntry);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.FILTERING_STYLE: {
-				FilteringStyle filteringStyle = (FilteringStyle)theEObject;
-				Object result = caseFilteringStyle(filteringStyle);
-				if (result == null) result = caseStyle(filteringStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DIAGRAM_STYLE: {
-				DiagramStyle diagramStyle = (DiagramStyle)theEObject;
-				Object result = caseDiagramStyle(diagramStyle);
-				if (result == null) result = casePageStyle(diagramStyle);
-				if (result == null) result = caseGuideStyle(diagramStyle);
-				if (result == null) result = caseDescriptionStyle(diagramStyle);
-				if (result == null) result = caseStyle(diagramStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.IMAGE_STYLE: {
-				ImageStyle imageStyle = (ImageStyle)theEObject;
-				Object result = caseImageStyle(imageStyle);
-				if (result == null) result = caseStyle(imageStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.IMAGE_BUFFER_STYLE: {
-				ImageBufferStyle imageBufferStyle = (ImageBufferStyle)theEObject;
-				Object result = caseImageBufferStyle(imageBufferStyle);
-				if (result == null) result = caseImageStyle(imageBufferStyle);
-				if (result == null) result = caseStyle(imageBufferStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.PROPERTIES_SET_STYLE: {
-				PropertiesSetStyle propertiesSetStyle = (PropertiesSetStyle)theEObject;
-				Object result = casePropertiesSetStyle(propertiesSetStyle);
-				if (result == null) result = caseNamedStyle(propertiesSetStyle);
-				if (result == null) result = caseStyle(propertiesSetStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY: {
-				Map.Entry stringToPropertyValueMapEntry = (Map.Entry)theEObject;
-				Object result = caseStringToPropertyValueMapEntry(stringToPropertyValueMapEntry);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.PROPERTY_VALUE: {
-				PropertyValue propertyValue = (PropertyValue)theEObject;
-				Object result = casePropertyValue(propertyValue);
-				if (result == null) result = caseStringObjectConverter(propertyValue);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.SINGLE_VALUE_STYLE: {
-				SingleValueStyle singleValueStyle = (SingleValueStyle)theEObject;
-				Object result = caseSingleValueStyle(singleValueStyle);
-				if (result == null) result = caseDataTypeStyle(singleValueStyle);
-				if (result == null) result = caseNamedStyle(singleValueStyle);
-				if (result == null) result = caseStringObjectConverter(singleValueStyle);
-				if (result == null) result = caseStyle(singleValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.LIST_VALUE_STYLE: {
-				ListValueStyle listValueStyle = (ListValueStyle)theEObject;
-				Object result = caseListValueStyle(listValueStyle);
-				if (result == null) result = caseDataTypeStyle(listValueStyle);
-				if (result == null) result = caseNamedStyle(listValueStyle);
-				if (result == null) result = caseStringObjectConverter(listValueStyle);
-				if (result == null) result = caseStyle(listValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.NAMED_STYLE: {
-				NamedStyle namedStyle = (NamedStyle)theEObject;
-				Object result = caseNamedStyle(namedStyle);
-				if (result == null) result = caseStyle(namedStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.STRING_OBJECT_CONVERTER: {
-				StringObjectConverter stringObjectConverter = (StringObjectConverter)theEObject;
-				Object result = caseStringObjectConverter(stringObjectConverter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DATA_TYPE_STYLE: {
-				DataTypeStyle dataTypeStyle = (DataTypeStyle)theEObject;
-				Object result = caseDataTypeStyle(dataTypeStyle);
-				if (result == null) result = caseNamedStyle(dataTypeStyle);
-				if (result == null) result = caseStringObjectConverter(dataTypeStyle);
-				if (result == null) result = caseStyle(dataTypeStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.INT_VALUE_STYLE: {
-				IntValueStyle intValueStyle = (IntValueStyle)theEObject;
-				Object result = caseIntValueStyle(intValueStyle);
-				if (result == null) result = caseNamedStyle(intValueStyle);
-				if (result == null) result = caseStyle(intValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.INT_LIST_VALUE_STYLE: {
-				IntListValueStyle intListValueStyle = (IntListValueStyle)theEObject;
-				Object result = caseIntListValueStyle(intListValueStyle);
-				if (result == null) result = caseNamedStyle(intListValueStyle);
-				if (result == null) result = caseStyle(intListValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.BOOLEAN_VALUE_STYLE: {
-				BooleanValueStyle booleanValueStyle = (BooleanValueStyle)theEObject;
-				Object result = caseBooleanValueStyle(booleanValueStyle);
-				if (result == null) result = caseNamedStyle(booleanValueStyle);
-				if (result == null) result = caseStyle(booleanValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DOUBLE_VALUE_STYLE: {
-				DoubleValueStyle doubleValueStyle = (DoubleValueStyle)theEObject;
-				Object result = caseDoubleValueStyle(doubleValueStyle);
-				if (result == null) result = caseNamedStyle(doubleValueStyle);
-				if (result == null) result = caseStyle(doubleValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DOUBLE_LIST_VALUE_STYLE: {
-				DoubleListValueStyle doubleListValueStyle = (DoubleListValueStyle)theEObject;
-				Object result = caseDoubleListValueStyle(doubleListValueStyle);
-				if (result == null) result = caseNamedStyle(doubleListValueStyle);
-				if (result == null) result = caseStyle(doubleListValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.STRING_VALUE_STYLE: {
-				StringValueStyle stringValueStyle = (StringValueStyle)theEObject;
-				Object result = caseStringValueStyle(stringValueStyle);
-				if (result == null) result = caseNamedStyle(stringValueStyle);
-				if (result == null) result = caseStyle(stringValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.STRING_LIST_VALUE_STYLE: {
-				StringListValueStyle stringListValueStyle = (StringListValueStyle)theEObject;
-				Object result = caseStringListValueStyle(stringListValueStyle);
-				if (result == null) result = caseNamedStyle(stringListValueStyle);
-				if (result == null) result = caseStyle(stringListValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.EOBJECT_VALUE_STYLE: {
-				EObjectValueStyle eObjectValueStyle = (EObjectValueStyle)theEObject;
-				Object result = caseEObjectValueStyle(eObjectValueStyle);
-				if (result == null) result = caseNamedStyle(eObjectValueStyle);
-				if (result == null) result = caseStyle(eObjectValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.EOBJECT_LIST_VALUE_STYLE: {
-				EObjectListValueStyle eObjectListValueStyle = (EObjectListValueStyle)theEObject;
-				Object result = caseEObjectListValueStyle(eObjectListValueStyle);
-				if (result == null) result = caseNamedStyle(eObjectListValueStyle);
-				if (result == null) result = caseStyle(eObjectListValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.BYTE_ARRAY_VALUE_STYLE: {
-				ByteArrayValueStyle byteArrayValueStyle = (ByteArrayValueStyle)theEObject;
-				Object result = caseByteArrayValueStyle(byteArrayValueStyle);
-				if (result == null) result = caseNamedStyle(byteArrayValueStyle);
-				if (result == null) result = caseStyle(byteArrayValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.BOOLEAN_LIST_VALUE_STYLE: {
-				BooleanListValueStyle booleanListValueStyle = (BooleanListValueStyle)theEObject;
-				Object result = caseBooleanListValueStyle(booleanListValueStyle);
-				if (result == null) result = caseNamedStyle(booleanListValueStyle);
-				if (result == null) result = caseStyle(booleanListValueStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.HINTED_DIAGRAM_LINK_STYLE: {
-				HintedDiagramLinkStyle hintedDiagramLinkStyle = (HintedDiagramLinkStyle)theEObject;
-				Object result = caseHintedDiagramLinkStyle(hintedDiagramLinkStyle);
-				if (result == null) result = caseDiagramLinkStyle(hintedDiagramLinkStyle);
-				if (result == null) result = caseStyle(hintedDiagramLinkStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DIAGRAM_LINK_STYLE: {
-				DiagramLinkStyle diagramLinkStyle = (DiagramLinkStyle)theEObject;
-				Object result = caseDiagramLinkStyle(diagramLinkStyle);
-				if (result == null) result = caseStyle(diagramLinkStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.MULTI_DIAGRAM_LINK_STYLE: {
-				MultiDiagramLinkStyle multiDiagramLinkStyle = (MultiDiagramLinkStyle)theEObject;
-				Object result = caseMultiDiagramLinkStyle(multiDiagramLinkStyle);
-				if (result == null) result = caseStyle(multiDiagramLinkStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.TEXT_STYLE: {
-				TextStyle textStyle = (TextStyle)theEObject;
-				Object result = caseTextStyle(textStyle);
-				if (result == null) result = caseStyle(textStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.LINE_TYPE_STYLE: {
-				LineTypeStyle lineTypeStyle = (LineTypeStyle)theEObject;
-				Object result = caseLineTypeStyle(lineTypeStyle);
-				if (result == null) result = caseStyle(lineTypeStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.ARROW_STYLE: {
-				ArrowStyle arrowStyle = (ArrowStyle)theEObject;
-				Object result = caseArrowStyle(arrowStyle);
-				if (result == null) result = caseStyle(arrowStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.SHAPE: {
-				Shape shape = (Shape)theEObject;
-				Object result = caseShape(shape);
-				if (result == null) result = caseNode(shape);
-				if (result == null) result = caseShapeStyle(shape);
-				if (result == null) result = caseView(shape);
-				if (result == null) result = caseFontStyle(shape);
-				if (result == null) result = caseDescriptionStyle(shape);
-				if (result == null) result = caseFillStyle(shape);
-				if (result == null) result = caseLineStyle(shape);
-				if (result == null) result = caseRoundedCornersStyle(shape);
-				if (result == null) result = caseEModelElement(shape);
-				if (result == null) result = caseStyle(shape);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.COMPARTMENT: {
-				Compartment compartment = (Compartment)theEObject;
-				Object result = caseCompartment(compartment);
-				if (result == null) result = caseBasicCompartment(compartment);
-				if (result == null) result = caseCanonicalStyle(compartment);
-				if (result == null) result = caseTitleStyle(compartment);
-				if (result == null) result = caseDecorationNode(compartment);
-				if (result == null) result = caseDrawerStyle(compartment);
-				if (result == null) result = caseStyle(compartment);
-				if (result == null) result = caseBasicDecorationNode(compartment);
-				if (result == null) result = caseNode(compartment);
-				if (result == null) result = caseView(compartment);
-				if (result == null) result = caseEModelElement(compartment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.LIST_COMPARTMENT: {
-				ListCompartment listCompartment = (ListCompartment)theEObject;
-				Object result = caseListCompartment(listCompartment);
-				if (result == null) result = caseBasicCompartment(listCompartment);
-				if (result == null) result = caseSortingStyle(listCompartment);
-				if (result == null) result = caseFilteringStyle(listCompartment);
-				if (result == null) result = caseTitleStyle(listCompartment);
-				if (result == null) result = caseDecorationNode(listCompartment);
-				if (result == null) result = caseDrawerStyle(listCompartment);
-				if (result == null) result = caseStyle(listCompartment);
-				if (result == null) result = caseBasicDecorationNode(listCompartment);
-				if (result == null) result = caseNode(listCompartment);
-				if (result == null) result = caseView(listCompartment);
-				if (result == null) result = caseEModelElement(listCompartment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.CONNECTOR: {
-				Connector connector = (Connector)theEObject;
-				Object result = caseConnector(connector);
-				if (result == null) result = caseEdge(connector);
-				if (result == null) result = caseConnectorStyle(connector);
-				if (result == null) result = caseView(connector);
-				if (result == null) result = caseRoutingStyle(connector);
-				if (result == null) result = caseLineStyle(connector);
-				if (result == null) result = caseEModelElement(connector);
-				if (result == null) result = caseRoundedCornersStyle(connector);
-				if (result == null) result = caseStyle(connector);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.STANDARD_DIAGRAM: {
-				StandardDiagram standardDiagram = (StandardDiagram)theEObject;
-				Object result = caseStandardDiagram(standardDiagram);
-				if (result == null) result = caseDiagram(standardDiagram);
-				if (result == null) result = caseDiagramStyle(standardDiagram);
-				if (result == null) result = caseView(standardDiagram);
-				if (result == null) result = casePageStyle(standardDiagram);
-				if (result == null) result = caseGuideStyle(standardDiagram);
-				if (result == null) result = caseDescriptionStyle(standardDiagram);
-				if (result == null) result = caseEModelElement(standardDiagram);
-				if (result == null) result = caseStyle(standardDiagram);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.DECORATION_NODE: {
-				DecorationNode decorationNode = (DecorationNode)theEObject;
-				Object result = caseDecorationNode(decorationNode);
-				if (result == null) result = caseBasicDecorationNode(decorationNode);
-				if (result == null) result = caseNode(decorationNode);
-				if (result == null) result = caseView(decorationNode);
-				if (result == null) result = caseEModelElement(decorationNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.BASIC_DECORATION_NODE: {
-				BasicDecorationNode basicDecorationNode = (BasicDecorationNode)theEObject;
-				Object result = caseBasicDecorationNode(basicDecorationNode);
-				if (result == null) result = caseNode(basicDecorationNode);
-				if (result == null) result = caseView(basicDecorationNode);
-				if (result == null) result = caseEModelElement(basicDecorationNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.BASIC_COMPARTMENT: {
-				BasicCompartment basicCompartment = (BasicCompartment)theEObject;
-				Object result = caseBasicCompartment(basicCompartment);
-				if (result == null) result = caseDecorationNode(basicCompartment);
-				if (result == null) result = caseDrawerStyle(basicCompartment);
-				if (result == null) result = caseBasicDecorationNode(basicCompartment);
-				if (result == null) result = caseStyle(basicCompartment);
-				if (result == null) result = caseNode(basicCompartment);
-				if (result == null) result = caseView(basicCompartment);
-				if (result == null) result = caseEModelElement(basicCompartment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.BASIC_SEMANTIC_COMPARTMENT: {
-				BasicSemanticCompartment basicSemanticCompartment = (BasicSemanticCompartment)theEObject;
-				Object result = caseBasicSemanticCompartment(basicSemanticCompartment);
-				if (result == null) result = caseBasicDecorationNode(basicSemanticCompartment);
-				if (result == null) result = caseDrawerStyle(basicSemanticCompartment);
-				if (result == null) result = caseNode(basicSemanticCompartment);
-				if (result == null) result = caseStyle(basicSemanticCompartment);
-				if (result == null) result = caseView(basicSemanticCompartment);
-				if (result == null) result = caseEModelElement(basicSemanticCompartment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.SEMANTIC_LIST_COMPARTMENT: {
-				SemanticListCompartment semanticListCompartment = (SemanticListCompartment)theEObject;
-				Object result = caseSemanticListCompartment(semanticListCompartment);
-				if (result == null) result = caseBasicSemanticCompartment(semanticListCompartment);
-				if (result == null) result = caseSortingStyle(semanticListCompartment);
-				if (result == null) result = caseFilteringStyle(semanticListCompartment);
-				if (result == null) result = caseTitleStyle(semanticListCompartment);
-				if (result == null) result = caseBasicDecorationNode(semanticListCompartment);
-				if (result == null) result = caseDrawerStyle(semanticListCompartment);
-				if (result == null) result = caseStyle(semanticListCompartment);
-				if (result == null) result = caseNode(semanticListCompartment);
-				if (result == null) result = caseView(semanticListCompartment);
-				if (result == null) result = caseEModelElement(semanticListCompartment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NotationPackage.ROUNDED_CORNERS_STYLE: {
-				RoundedCornersStyle roundedCornersStyle = (RoundedCornersStyle)theEObject;
-				Object result = caseRoundedCornersStyle(roundedCornersStyle);
-				if (result == null) result = caseStyle(roundedCornersStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		case NotationPackage.EDGE: {
+			Edge edge = (Edge) theEObject;
+			Object result = caseEdge(edge);
+			if (result == null)
+				result = caseView(edge);
+			if (result == null)
+				result = caseEModelElement(edge);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.NODE: {
+			Node node = (Node) theEObject;
+			Object result = caseNode(node);
+			if (result == null)
+				result = caseView(node);
+			if (result == null)
+				result = caseEModelElement(node);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.STYLE: {
+			Style style = (Style) theEObject;
+			Object result = caseStyle(style);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.FILL_STYLE: {
+			FillStyle fillStyle = (FillStyle) theEObject;
+			Object result = caseFillStyle(fillStyle);
+			if (result == null)
+				result = caseStyle(fillStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.LINE_STYLE: {
+			LineStyle lineStyle = (LineStyle) theEObject;
+			Object result = caseLineStyle(lineStyle);
+			if (result == null)
+				result = caseStyle(lineStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.FONT_STYLE: {
+			FontStyle fontStyle = (FontStyle) theEObject;
+			Object result = caseFontStyle(fontStyle);
+			if (result == null)
+				result = caseStyle(fontStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.TITLE_STYLE: {
+			TitleStyle titleStyle = (TitleStyle) theEObject;
+			Object result = caseTitleStyle(titleStyle);
+			if (result == null)
+				result = caseStyle(titleStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.SORTING_STYLE: {
+			SortingStyle sortingStyle = (SortingStyle) theEObject;
+			Object result = caseSortingStyle(sortingStyle);
+			if (result == null)
+				result = caseStyle(sortingStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DESCRIPTION_STYLE: {
+			DescriptionStyle descriptionStyle = (DescriptionStyle) theEObject;
+			Object result = caseDescriptionStyle(descriptionStyle);
+			if (result == null)
+				result = caseStyle(descriptionStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.LAYOUT_CONSTRAINT: {
+			LayoutConstraint layoutConstraint = (LayoutConstraint) theEObject;
+			Object result = caseLayoutConstraint(layoutConstraint);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.SIZE: {
+			Size size = (Size) theEObject;
+			Object result = caseSize(size);
+			if (result == null)
+				result = caseLayoutConstraint(size);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.LOCATION: {
+			Location location = (Location) theEObject;
+			Object result = caseLocation(location);
+			if (result == null)
+				result = caseLayoutConstraint(location);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.BOUNDS: {
+			Bounds bounds = (Bounds) theEObject;
+			Object result = caseBounds(bounds);
+			if (result == null)
+				result = caseLocation(bounds);
+			if (result == null)
+				result = caseSize(bounds);
+			if (result == null)
+				result = caseLayoutConstraint(bounds);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.RATIO: {
+			Ratio ratio = (Ratio) theEObject;
+			Object result = caseRatio(ratio);
+			if (result == null)
+				result = caseLayoutConstraint(ratio);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.ANCHOR: {
+			Anchor anchor = (Anchor) theEObject;
+			Object result = caseAnchor(anchor);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.BENDPOINTS: {
+			Bendpoints bendpoints = (Bendpoints) theEObject;
+			Object result = caseBendpoints(bendpoints);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.IDENTITY_ANCHOR: {
+			IdentityAnchor identityAnchor = (IdentityAnchor) theEObject;
+			Object result = caseIdentityAnchor(identityAnchor);
+			if (result == null)
+				result = caseAnchor(identityAnchor);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.ROUTING_STYLE: {
+			RoutingStyle routingStyle = (RoutingStyle) theEObject;
+			Object result = caseRoutingStyle(routingStyle);
+			if (result == null)
+				result = caseRoundedCornersStyle(routingStyle);
+			if (result == null)
+				result = caseStyle(routingStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.VIEW: {
+			View view = (View) theEObject;
+			Object result = caseView(view);
+			if (result == null)
+				result = caseEModelElement(view);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.RELATIVE_BENDPOINTS: {
+			RelativeBendpoints relativeBendpoints = (RelativeBendpoints) theEObject;
+			Object result = caseRelativeBendpoints(relativeBendpoints);
+			if (result == null)
+				result = caseBendpoints(relativeBendpoints);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DIAGRAM: {
+			Diagram diagram = (Diagram) theEObject;
+			Object result = caseDiagram(diagram);
+			if (result == null)
+				result = caseView(diagram);
+			if (result == null)
+				result = caseEModelElement(diagram);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.IMAGE: {
+			Image image = (Image) theEObject;
+			Object result = caseImage(image);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.CANONICAL_STYLE: {
+			CanonicalStyle canonicalStyle = (CanonicalStyle) theEObject;
+			Object result = caseCanonicalStyle(canonicalStyle);
+			if (result == null)
+				result = caseStyle(canonicalStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.SHAPE_STYLE: {
+			ShapeStyle shapeStyle = (ShapeStyle) theEObject;
+			Object result = caseShapeStyle(shapeStyle);
+			if (result == null)
+				result = caseFontStyle(shapeStyle);
+			if (result == null)
+				result = caseDescriptionStyle(shapeStyle);
+			if (result == null)
+				result = caseFillStyle(shapeStyle);
+			if (result == null)
+				result = caseLineStyle(shapeStyle);
+			if (result == null)
+				result = caseRoundedCornersStyle(shapeStyle);
+			if (result == null)
+				result = caseStyle(shapeStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.CONNECTOR_STYLE: {
+			ConnectorStyle connectorStyle = (ConnectorStyle) theEObject;
+			Object result = caseConnectorStyle(connectorStyle);
+			if (result == null)
+				result = caseRoutingStyle(connectorStyle);
+			if (result == null)
+				result = caseLineStyle(connectorStyle);
+			if (result == null)
+				result = caseRoundedCornersStyle(connectorStyle);
+			if (result == null)
+				result = caseStyle(connectorStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.PAGE_STYLE: {
+			PageStyle pageStyle = (PageStyle) theEObject;
+			Object result = casePageStyle(pageStyle);
+			if (result == null)
+				result = caseStyle(pageStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DRAWER_STYLE: {
+			DrawerStyle drawerStyle = (DrawerStyle) theEObject;
+			Object result = caseDrawerStyle(drawerStyle);
+			if (result == null)
+				result = caseStyle(drawerStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.GUIDE_STYLE: {
+			GuideStyle guideStyle = (GuideStyle) theEObject;
+			Object result = caseGuideStyle(guideStyle);
+			if (result == null)
+				result = caseStyle(guideStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.GUIDE: {
+			Guide guide = (Guide) theEObject;
+			Object result = caseGuide(guide);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.NODE_ENTRY: {
+			Map.Entry nodeEntry = (Map.Entry) theEObject;
+			Object result = caseNodeEntry(nodeEntry);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.FILTERING_STYLE: {
+			FilteringStyle filteringStyle = (FilteringStyle) theEObject;
+			Object result = caseFilteringStyle(filteringStyle);
+			if (result == null)
+				result = caseStyle(filteringStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DIAGRAM_STYLE: {
+			DiagramStyle diagramStyle = (DiagramStyle) theEObject;
+			Object result = caseDiagramStyle(diagramStyle);
+			if (result == null)
+				result = casePageStyle(diagramStyle);
+			if (result == null)
+				result = caseGuideStyle(diagramStyle);
+			if (result == null)
+				result = caseDescriptionStyle(diagramStyle);
+			if (result == null)
+				result = caseStyle(diagramStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.IMAGE_STYLE: {
+			ImageStyle imageStyle = (ImageStyle) theEObject;
+			Object result = caseImageStyle(imageStyle);
+			if (result == null)
+				result = caseStyle(imageStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.IMAGE_BUFFER_STYLE: {
+			ImageBufferStyle imageBufferStyle = (ImageBufferStyle) theEObject;
+			Object result = caseImageBufferStyle(imageBufferStyle);
+			if (result == null)
+				result = caseImageStyle(imageBufferStyle);
+			if (result == null)
+				result = caseStyle(imageBufferStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.PROPERTIES_SET_STYLE: {
+			PropertiesSetStyle propertiesSetStyle = (PropertiesSetStyle) theEObject;
+			Object result = casePropertiesSetStyle(propertiesSetStyle);
+			if (result == null)
+				result = caseNamedStyle(propertiesSetStyle);
+			if (result == null)
+				result = caseStyle(propertiesSetStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.STRING_TO_PROPERTY_VALUE_MAP_ENTRY: {
+			Map.Entry stringToPropertyValueMapEntry = (Map.Entry) theEObject;
+			Object result = caseStringToPropertyValueMapEntry(stringToPropertyValueMapEntry);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.PROPERTY_VALUE: {
+			PropertyValue propertyValue = (PropertyValue) theEObject;
+			Object result = casePropertyValue(propertyValue);
+			if (result == null)
+				result = caseStringObjectConverter(propertyValue);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.SINGLE_VALUE_STYLE: {
+			SingleValueStyle singleValueStyle = (SingleValueStyle) theEObject;
+			Object result = caseSingleValueStyle(singleValueStyle);
+			if (result == null)
+				result = caseDataTypeStyle(singleValueStyle);
+			if (result == null)
+				result = caseNamedStyle(singleValueStyle);
+			if (result == null)
+				result = caseStringObjectConverter(singleValueStyle);
+			if (result == null)
+				result = caseStyle(singleValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.LIST_VALUE_STYLE: {
+			ListValueStyle listValueStyle = (ListValueStyle) theEObject;
+			Object result = caseListValueStyle(listValueStyle);
+			if (result == null)
+				result = caseDataTypeStyle(listValueStyle);
+			if (result == null)
+				result = caseNamedStyle(listValueStyle);
+			if (result == null)
+				result = caseStringObjectConverter(listValueStyle);
+			if (result == null)
+				result = caseStyle(listValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.NAMED_STYLE: {
+			NamedStyle namedStyle = (NamedStyle) theEObject;
+			Object result = caseNamedStyle(namedStyle);
+			if (result == null)
+				result = caseStyle(namedStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.STRING_OBJECT_CONVERTER: {
+			StringObjectConverter stringObjectConverter = (StringObjectConverter) theEObject;
+			Object result = caseStringObjectConverter(stringObjectConverter);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DATA_TYPE_STYLE: {
+			DataTypeStyle dataTypeStyle = (DataTypeStyle) theEObject;
+			Object result = caseDataTypeStyle(dataTypeStyle);
+			if (result == null)
+				result = caseNamedStyle(dataTypeStyle);
+			if (result == null)
+				result = caseStringObjectConverter(dataTypeStyle);
+			if (result == null)
+				result = caseStyle(dataTypeStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.INT_VALUE_STYLE: {
+			IntValueStyle intValueStyle = (IntValueStyle) theEObject;
+			Object result = caseIntValueStyle(intValueStyle);
+			if (result == null)
+				result = caseNamedStyle(intValueStyle);
+			if (result == null)
+				result = caseStyle(intValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.INT_LIST_VALUE_STYLE: {
+			IntListValueStyle intListValueStyle = (IntListValueStyle) theEObject;
+			Object result = caseIntListValueStyle(intListValueStyle);
+			if (result == null)
+				result = caseNamedStyle(intListValueStyle);
+			if (result == null)
+				result = caseStyle(intListValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.BOOLEAN_VALUE_STYLE: {
+			BooleanValueStyle booleanValueStyle = (BooleanValueStyle) theEObject;
+			Object result = caseBooleanValueStyle(booleanValueStyle);
+			if (result == null)
+				result = caseNamedStyle(booleanValueStyle);
+			if (result == null)
+				result = caseStyle(booleanValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DOUBLE_VALUE_STYLE: {
+			DoubleValueStyle doubleValueStyle = (DoubleValueStyle) theEObject;
+			Object result = caseDoubleValueStyle(doubleValueStyle);
+			if (result == null)
+				result = caseNamedStyle(doubleValueStyle);
+			if (result == null)
+				result = caseStyle(doubleValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DOUBLE_LIST_VALUE_STYLE: {
+			DoubleListValueStyle doubleListValueStyle = (DoubleListValueStyle) theEObject;
+			Object result = caseDoubleListValueStyle(doubleListValueStyle);
+			if (result == null)
+				result = caseNamedStyle(doubleListValueStyle);
+			if (result == null)
+				result = caseStyle(doubleListValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.STRING_VALUE_STYLE: {
+			StringValueStyle stringValueStyle = (StringValueStyle) theEObject;
+			Object result = caseStringValueStyle(stringValueStyle);
+			if (result == null)
+				result = caseNamedStyle(stringValueStyle);
+			if (result == null)
+				result = caseStyle(stringValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.STRING_LIST_VALUE_STYLE: {
+			StringListValueStyle stringListValueStyle = (StringListValueStyle) theEObject;
+			Object result = caseStringListValueStyle(stringListValueStyle);
+			if (result == null)
+				result = caseNamedStyle(stringListValueStyle);
+			if (result == null)
+				result = caseStyle(stringListValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.EOBJECT_VALUE_STYLE: {
+			EObjectValueStyle eObjectValueStyle = (EObjectValueStyle) theEObject;
+			Object result = caseEObjectValueStyle(eObjectValueStyle);
+			if (result == null)
+				result = caseNamedStyle(eObjectValueStyle);
+			if (result == null)
+				result = caseStyle(eObjectValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.EOBJECT_LIST_VALUE_STYLE: {
+			EObjectListValueStyle eObjectListValueStyle = (EObjectListValueStyle) theEObject;
+			Object result = caseEObjectListValueStyle(eObjectListValueStyle);
+			if (result == null)
+				result = caseNamedStyle(eObjectListValueStyle);
+			if (result == null)
+				result = caseStyle(eObjectListValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.BYTE_ARRAY_VALUE_STYLE: {
+			ByteArrayValueStyle byteArrayValueStyle = (ByteArrayValueStyle) theEObject;
+			Object result = caseByteArrayValueStyle(byteArrayValueStyle);
+			if (result == null)
+				result = caseNamedStyle(byteArrayValueStyle);
+			if (result == null)
+				result = caseStyle(byteArrayValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.BOOLEAN_LIST_VALUE_STYLE: {
+			BooleanListValueStyle booleanListValueStyle = (BooleanListValueStyle) theEObject;
+			Object result = caseBooleanListValueStyle(booleanListValueStyle);
+			if (result == null)
+				result = caseNamedStyle(booleanListValueStyle);
+			if (result == null)
+				result = caseStyle(booleanListValueStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.HINTED_DIAGRAM_LINK_STYLE: {
+			HintedDiagramLinkStyle hintedDiagramLinkStyle = (HintedDiagramLinkStyle) theEObject;
+			Object result = caseHintedDiagramLinkStyle(hintedDiagramLinkStyle);
+			if (result == null)
+				result = caseDiagramLinkStyle(hintedDiagramLinkStyle);
+			if (result == null)
+				result = caseStyle(hintedDiagramLinkStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DIAGRAM_LINK_STYLE: {
+			DiagramLinkStyle diagramLinkStyle = (DiagramLinkStyle) theEObject;
+			Object result = caseDiagramLinkStyle(diagramLinkStyle);
+			if (result == null)
+				result = caseStyle(diagramLinkStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.MULTI_DIAGRAM_LINK_STYLE: {
+			MultiDiagramLinkStyle multiDiagramLinkStyle = (MultiDiagramLinkStyle) theEObject;
+			Object result = caseMultiDiagramLinkStyle(multiDiagramLinkStyle);
+			if (result == null)
+				result = caseStyle(multiDiagramLinkStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.TEXT_STYLE: {
+			TextStyle textStyle = (TextStyle) theEObject;
+			Object result = caseTextStyle(textStyle);
+			if (result == null)
+				result = caseStyle(textStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.LINE_TYPE_STYLE: {
+			LineTypeStyle lineTypeStyle = (LineTypeStyle) theEObject;
+			Object result = caseLineTypeStyle(lineTypeStyle);
+			if (result == null)
+				result = caseStyle(lineTypeStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.ARROW_STYLE: {
+			ArrowStyle arrowStyle = (ArrowStyle) theEObject;
+			Object result = caseArrowStyle(arrowStyle);
+			if (result == null)
+				result = caseStyle(arrowStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.SHAPE: {
+			Shape shape = (Shape) theEObject;
+			Object result = caseShape(shape);
+			if (result == null)
+				result = caseNode(shape);
+			if (result == null)
+				result = caseShapeStyle(shape);
+			if (result == null)
+				result = caseView(shape);
+			if (result == null)
+				result = caseFontStyle(shape);
+			if (result == null)
+				result = caseDescriptionStyle(shape);
+			if (result == null)
+				result = caseFillStyle(shape);
+			if (result == null)
+				result = caseLineStyle(shape);
+			if (result == null)
+				result = caseRoundedCornersStyle(shape);
+			if (result == null)
+				result = caseEModelElement(shape);
+			if (result == null)
+				result = caseStyle(shape);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.COMPARTMENT: {
+			Compartment compartment = (Compartment) theEObject;
+			Object result = caseCompartment(compartment);
+			if (result == null)
+				result = caseBasicCompartment(compartment);
+			if (result == null)
+				result = caseCanonicalStyle(compartment);
+			if (result == null)
+				result = caseTitleStyle(compartment);
+			if (result == null)
+				result = caseDecorationNode(compartment);
+			if (result == null)
+				result = caseDrawerStyle(compartment);
+			if (result == null)
+				result = caseBasicDecorationNode(compartment);
+			if (result == null)
+				result = caseStyle(compartment);
+			if (result == null)
+				result = caseNode(compartment);
+			if (result == null)
+				result = caseView(compartment);
+			if (result == null)
+				result = caseEModelElement(compartment);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.LIST_COMPARTMENT: {
+			ListCompartment listCompartment = (ListCompartment) theEObject;
+			Object result = caseListCompartment(listCompartment);
+			if (result == null)
+				result = caseBasicCompartment(listCompartment);
+			if (result == null)
+				result = caseSortingStyle(listCompartment);
+			if (result == null)
+				result = caseFilteringStyle(listCompartment);
+			if (result == null)
+				result = caseTitleStyle(listCompartment);
+			if (result == null)
+				result = caseDecorationNode(listCompartment);
+			if (result == null)
+				result = caseDrawerStyle(listCompartment);
+			if (result == null)
+				result = caseBasicDecorationNode(listCompartment);
+			if (result == null)
+				result = caseStyle(listCompartment);
+			if (result == null)
+				result = caseNode(listCompartment);
+			if (result == null)
+				result = caseView(listCompartment);
+			if (result == null)
+				result = caseEModelElement(listCompartment);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.CONNECTOR: {
+			Connector connector = (Connector) theEObject;
+			Object result = caseConnector(connector);
+			if (result == null)
+				result = caseEdge(connector);
+			if (result == null)
+				result = caseConnectorStyle(connector);
+			if (result == null)
+				result = caseView(connector);
+			if (result == null)
+				result = caseRoutingStyle(connector);
+			if (result == null)
+				result = caseLineStyle(connector);
+			if (result == null)
+				result = caseEModelElement(connector);
+			if (result == null)
+				result = caseRoundedCornersStyle(connector);
+			if (result == null)
+				result = caseStyle(connector);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.STANDARD_DIAGRAM: {
+			StandardDiagram standardDiagram = (StandardDiagram) theEObject;
+			Object result = caseStandardDiagram(standardDiagram);
+			if (result == null)
+				result = caseDiagram(standardDiagram);
+			if (result == null)
+				result = caseDiagramStyle(standardDiagram);
+			if (result == null)
+				result = caseView(standardDiagram);
+			if (result == null)
+				result = casePageStyle(standardDiagram);
+			if (result == null)
+				result = caseGuideStyle(standardDiagram);
+			if (result == null)
+				result = caseDescriptionStyle(standardDiagram);
+			if (result == null)
+				result = caseEModelElement(standardDiagram);
+			if (result == null)
+				result = caseStyle(standardDiagram);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.DECORATION_NODE: {
+			DecorationNode decorationNode = (DecorationNode) theEObject;
+			Object result = caseDecorationNode(decorationNode);
+			if (result == null)
+				result = caseBasicDecorationNode(decorationNode);
+			if (result == null)
+				result = caseNode(decorationNode);
+			if (result == null)
+				result = caseView(decorationNode);
+			if (result == null)
+				result = caseEModelElement(decorationNode);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.BASIC_DECORATION_NODE: {
+			BasicDecorationNode basicDecorationNode = (BasicDecorationNode) theEObject;
+			Object result = caseBasicDecorationNode(basicDecorationNode);
+			if (result == null)
+				result = caseNode(basicDecorationNode);
+			if (result == null)
+				result = caseView(basicDecorationNode);
+			if (result == null)
+				result = caseEModelElement(basicDecorationNode);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.BASIC_COMPARTMENT: {
+			BasicCompartment basicCompartment = (BasicCompartment) theEObject;
+			Object result = caseBasicCompartment(basicCompartment);
+			if (result == null)
+				result = caseDecorationNode(basicCompartment);
+			if (result == null)
+				result = caseDrawerStyle(basicCompartment);
+			if (result == null)
+				result = caseBasicDecorationNode(basicCompartment);
+			if (result == null)
+				result = caseStyle(basicCompartment);
+			if (result == null)
+				result = caseNode(basicCompartment);
+			if (result == null)
+				result = caseView(basicCompartment);
+			if (result == null)
+				result = caseEModelElement(basicCompartment);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.BASIC_SEMANTIC_COMPARTMENT: {
+			BasicSemanticCompartment basicSemanticCompartment = (BasicSemanticCompartment) theEObject;
+			Object result = caseBasicSemanticCompartment(basicSemanticCompartment);
+			if (result == null)
+				result = caseBasicDecorationNode(basicSemanticCompartment);
+			if (result == null)
+				result = caseDrawerStyle(basicSemanticCompartment);
+			if (result == null)
+				result = caseNode(basicSemanticCompartment);
+			if (result == null)
+				result = caseStyle(basicSemanticCompartment);
+			if (result == null)
+				result = caseView(basicSemanticCompartment);
+			if (result == null)
+				result = caseEModelElement(basicSemanticCompartment);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.SEMANTIC_LIST_COMPARTMENT: {
+			SemanticListCompartment semanticListCompartment = (SemanticListCompartment) theEObject;
+			Object result = caseSemanticListCompartment(semanticListCompartment);
+			if (result == null)
+				result = caseBasicSemanticCompartment(semanticListCompartment);
+			if (result == null)
+				result = caseSortingStyle(semanticListCompartment);
+			if (result == null)
+				result = caseFilteringStyle(semanticListCompartment);
+			if (result == null)
+				result = caseTitleStyle(semanticListCompartment);
+			if (result == null)
+				result = caseBasicDecorationNode(semanticListCompartment);
+			if (result == null)
+				result = caseDrawerStyle(semanticListCompartment);
+			if (result == null)
+				result = caseNode(semanticListCompartment);
+			if (result == null)
+				result = caseStyle(semanticListCompartment);
+			if (result == null)
+				result = caseView(semanticListCompartment);
+			if (result == null)
+				result = caseEModelElement(semanticListCompartment);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NotationPackage.ROUNDED_CORNERS_STYLE: {
+			RoundedCornersStyle roundedCornersStyle = (RoundedCornersStyle) theEObject;
+			Object result = caseRoundedCornersStyle(roundedCornersStyle);
+			if (result == null)
+				result = caseStyle(roundedCornersStyle);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Edge</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Edge</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Edge</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -737,14 +1005,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Node</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Node</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -752,14 +1020,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -767,14 +1035,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Fill Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Fill
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Fill Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Fill
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -782,14 +1050,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Line Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Line
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Line Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Line
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -797,14 +1065,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Font Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Font
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Font Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Font
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -812,14 +1080,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Title Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Title
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Title Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Title
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -827,14 +1095,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Sorting Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Sorting
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sorting Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Sorting
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -842,14 +1110,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Description Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Description Style</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Description Style</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Description Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -857,14 +1126,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Layout Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Layout
+	 * Constraint</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Layout Constraint</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Layout
+	 *         Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -872,14 +1141,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Size</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Size</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Size</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Size</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -887,14 +1156,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Location</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Location</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Location</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Location</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -902,14 +1172,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Bounds</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Bounds</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bounds</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Bounds</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -917,14 +1187,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Ratio</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Ratio</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ratio</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Ratio</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -932,14 +1202,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Anchor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Anchor</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Anchor</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Anchor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -947,14 +1217,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Bendpoints</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Bendpoints</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bendpoints</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Bendpoints</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -962,14 +1233,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Identity Anchor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Identity
+	 * Anchor</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Identity Anchor</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Identity
+	 *         Anchor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -977,14 +1248,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Routing Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Routing
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Routing Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Routing
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -992,14 +1263,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>View</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>View</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>View</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>View</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1007,14 +1278,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Relative Bendpoints</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Relative
+	 * Bendpoints</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Relative Bendpoints</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Relative
+	 *         Bendpoints</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1022,14 +1293,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Canonical Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Canonical Style</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Canonical Style</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Canonical Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1037,14 +1309,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Shape Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Shape
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Shape Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Shape
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1052,14 +1324,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Connector Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Connector Style</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Connector Style</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Connector Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1067,14 +1340,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Diagram</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1082,14 +1355,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Image</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Image</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Image</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1097,14 +1370,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Page Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Page
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Page Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Page
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1112,14 +1385,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Drawer Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Drawer
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Drawer Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Drawer
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1127,14 +1400,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Guide Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Guide
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Guide Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Guide
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1142,14 +1415,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Guide</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Guide</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Guide</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Guide</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1157,14 +1430,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Node Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Node
+	 * Entry</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Node Entry</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Node
+	 *         Entry</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1172,14 +1445,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Filtering Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Filtering Style</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Filtering Style</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Filtering Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1187,14 +1461,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Diagram Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Diagram
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Diagram Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Diagram
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1202,14 +1476,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Image Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Image
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Image Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Image
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1217,14 +1491,14 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Image Buffer Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Image
+	 * Buffer Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Image Buffer Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Image
+	 *         Buffer Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1232,14 +1506,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>Properties Set Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Properties Set Style</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Properties Set Style</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Properties Set Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1247,14 +1522,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>String To Property Value Map Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String
+	 * To Property Value Map Entry</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate the
+	 * switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>String To Property Value Map Entry</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>String
+	 *         To Property Value Map Entry</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1262,14 +1538,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Property Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Property
+	 * Value</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Property Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Property
+	 *         Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1277,14 +1553,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Single Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Single
+	 * Value Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Single Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Single
+	 *         Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1292,14 +1568,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>List
+	 * Value Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>List
+	 *         Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1307,14 +1583,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Named Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Named
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Named Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Named
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1322,14 +1598,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>String Object Converter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String
+	 * Object Converter</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>String Object Converter</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>String
+	 *         Object Converter</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1337,14 +1614,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Data Type Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Data
+	 * Type Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Data Type Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Data
+	 *         Type Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1352,14 +1629,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Int Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Int
+	 * Value Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Int Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Int
+	 *         Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1367,14 +1644,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Int List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Int List
+	 * Value Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Int List Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Int List
+	 *         Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1382,14 +1659,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Boolean
+	 * Value Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Boolean Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Boolean
+	 *         Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1397,14 +1674,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Double Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Double
+	 * Value Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Double Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Double
+	 *         Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1412,14 +1689,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Double List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Double
+	 * List Value Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Double List Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Double
+	 *         List Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1427,14 +1705,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>String Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String
+	 * Value Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>String Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>String
+	 *         Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1442,14 +1720,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>String List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String
+	 * List Value Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>String List Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>String
+	 *         List Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1457,14 +1736,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject
+	 * Value Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject
+	 *         Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1472,14 +1751,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject
+	 * List Value Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject
+	 *         List Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1487,14 +1767,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Byte Array Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Byte
+	 * Array Value Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Byte Array Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Byte
+	 *         Array Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1502,14 +1783,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Boolean List Value Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Boolean
+	 * List Value Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Boolean List Value Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Boolean
+	 *         List Value Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1517,14 +1799,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hinted Diagram Link Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Hinted
+	 * Diagram Link Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hinted Diagram Link Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Hinted
+	 *         Diagram Link Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1532,14 +1815,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Diagram Link Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Diagram
+	 * Link Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Diagram Link Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Diagram
+	 *         Link Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1547,14 +1830,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Multi Diagram Link Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Multi
+	 * Diagram Link Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Multi Diagram Link Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Multi
+	 *         Diagram Link Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1562,14 +1846,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Text Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Text
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Text Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Text
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1577,14 +1861,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Line Type Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Line
+	 * Type Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Line Type Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Line
+	 *         Type Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1592,14 +1876,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Arrow Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Arrow
+	 * Style</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Arrow Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Arrow
+	 *         Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1607,14 +1891,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Shape</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Shape</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1622,14 +1906,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Compartment</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Compartment</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Compartment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1638,14 +1923,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>List
+	 * Compartment</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Compartment</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>List
+	 *         Compartment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1654,14 +1939,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Connector</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Connector</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Connector</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Connector</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1670,14 +1956,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Standard Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Standard
+	 * Diagram</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Standard Diagram</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Standard
+	 *         Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1686,14 +1972,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Decoration Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>Decoration Node</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Decoration Node</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>Decoration Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1702,14 +1989,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Basic Decoration Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Basic
+	 * Decoration Node</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Basic Decoration Node</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Basic
+	 *         Decoration Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1718,14 +2006,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Basic Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Basic
+	 * Compartment</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Basic Compartment</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Basic
+	 *         Compartment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1734,14 +2022,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Basic Semantic Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Basic
+	 * Semantic Compartment</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Basic Semantic Compartment</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Basic
+	 *         Semantic Compartment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1750,14 +2039,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Semantic List Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Semantic
+	 * List Compartment</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Semantic List Compartment</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Semantic
+	 *         List Compartment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 * @since 1.2
@@ -1766,14 +2056,15 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>Rounded Corners Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Rounded
+	 * Corners Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Rounded Corners Style</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Rounded
+	 *         Corners Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1781,14 +2072,14 @@
 		return null;
 	}
 
-				/**
-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel
+	 * Element</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EModel
+	 *         Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1796,14 +2087,15 @@
 		return null;
 	}
 
-    /**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>EObject</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last
+	 * case anyway. <!-- end-user-doc -->
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
@@ -1811,4 +2103,4 @@
 		return null;
 	}
 
-} //NotationSwitch
+} // NotationSwitch