catch up with development

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/ViewEditpart.java b/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/ViewEditpart.java
index 8dc8ab7..46d4095 100644
--- a/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/ViewEditpart.java
+++ b/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/ViewEditpart.java
@@ -52,6 +52,7 @@
 import org.eclipse.osbp.ecview.core.common.model.core.YDetailBeanSlot;
 import org.eclipse.osbp.ecview.core.common.model.core.YElement;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
+import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableSelectionEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableValueEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YExposedAction;
 import org.eclipse.osbp.ecview.core.common.model.core.YFocusable;
@@ -205,10 +206,12 @@
 						YEmbeddableValueEndpoint ep = (YEmbeddableValueEndpoint) binding
 								.getTargetEndpoint();
 						return ep.getElement();
-					} else if (oppositeId
-							.startsWith(BindingIdUtil.MODEL_BINDING)
-							&& (oppositeId.endsWith("value") || oppositeId
-									.endsWith("collection"))) {
+					} else 	if (oppositeId.startsWith(BindingIdUtil.UI_SELECTION)) {
+							// we found the field
+							YEmbeddableSelectionEndpoint ep = (YEmbeddableSelectionEndpoint) binding.getTargetEndpoint();
+							return ep.getElement();
+					} else if (oppositeId.startsWith(BindingIdUtil.MODEL_BINDING)
+							&& (oppositeId.endsWith("value") || oppositeId.endsWith("collection"))) {
 						// we found the field
 						YECViewModelValueBindingEndpoint ep = (YECViewModelValueBindingEndpoint) binding
 								.getTargetEndpoint();
@@ -222,15 +225,18 @@
 					// yFieldEndpoint
 					String oppositeId = binding.getModelEndpoint()
 							.getBindingIdString();
-					if (oppositeId.startsWith(BindingIdUtil.UI_VALUE)) {
+					if (oppositeId.startsWith(BindingIdUtil.UI_VALUE) ) {
 						// we found the field
 						YEmbeddableValueEndpoint ep = (YEmbeddableValueEndpoint) binding
 								.getModelEndpoint();
 						return ep.getElement();
-					} else if (oppositeId
-							.startsWith(BindingIdUtil.MODEL_BINDING)
-							&& (oppositeId.endsWith("value") || oppositeId
-									.endsWith("collection"))) {
+					} else if (oppositeId.startsWith(BindingIdUtil.UI_SELECTION) ) {
+							// we found the field
+						YEmbeddableSelectionEndpoint ep = (YEmbeddableSelectionEndpoint) binding
+								.getModelEndpoint();
+						return ep.getElement();
+					} else if (oppositeId.startsWith(BindingIdUtil.MODEL_BINDING)
+							&& (oppositeId.endsWith("value") || oppositeId.endsWith("collection"))) {
 						// we found the field
 						YECViewModelValueBindingEndpoint ep = (YECViewModelValueBindingEndpoint) binding
 								.getTargetEndpoint();
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/context/DisposableContext.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/context/DisposableContext.java
index 67eceaa..c5d7e46 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/context/DisposableContext.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/context/DisposableContext.java
@@ -146,7 +146,7 @@
 	@Override
 	public ISlot createBeanSlot(String selector, Class<?> type) {
 		ISlot slot = getBeanSlot(selector);
-		if (slot == null) {
+		if (slot == null && type != null) {
 			slot = new ObjectBean(type);
 			valueBeans.put(selector, slot);
 		}
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/visibility/IVisibilityHandler.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/visibility/IVisibilityHandler.java
index 26fc231..40606d0 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/visibility/IVisibilityHandler.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/visibility/IVisibilityHandler.java
@@ -258,6 +258,13 @@
 	 * Applies the options to the assigned UI element.
 	 */
 	void apply();
+	
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
+	String toString();
 
 	/**
 	 * The Class NotValidProcessableException.
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/visibility/impl/VisibilityHandler.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/visibility/impl/VisibilityHandler.java
index bee7eef..ee9f78b 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/visibility/impl/VisibilityHandler.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/visibility/impl/VisibilityHandler.java
@@ -21,7 +21,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class VisibilityHandler.
  */
@@ -459,6 +458,19 @@
 		return null;
 	}
 
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("enabled:");
+		sb.append(this.isEnabled());
+		sb.append(" editable:");
+		sb.append(this.isEditable());
+		sb.append(" visible:");
+		sb.append(this.isVisible());
+		
+		return sb.toString();
+	}
+	
 	/**
 	 * The Class UiElementAccessImpl.
 	 */
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/plugin.properties b/org.eclipse.osbp.ecview.core.extension.model.edit/plugin.properties
index 4325590..067b5e9 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/plugin.properties
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/plugin.properties
@@ -440,3 +440,5 @@
 _UI_YDialogComponent_callback_feature = Callback
 _UI_YDialogComponent_viewContextCallback_feature = View Context Callback
 _UI_YDialogComponent_updateCallback_feature = Update Callback
+_UI_YEnumComboBox_defaultLiteral_feature = Default Literal
+_UI_YSuggestTextField_currentValueDTO_feature = Current Value DTO
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YEnumComboBoxItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YEnumComboBoxItemProvider.java
index 2d1eaaa..6027df7 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YEnumComboBoxItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YEnumComboBoxItemProvider.java
@@ -68,6 +68,7 @@
 			addTypePropertyDescriptor(object);
 			addEmfNsURIPropertyDescriptor(object);
 			addTypeQualifiedNamePropertyDescriptor(object);
+			addDefaultLiteralPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -249,6 +250,28 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Default Literal feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDefaultLiteralPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YEnumComboBox_defaultLiteral_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YEnumComboBox_defaultLiteral_feature", "_UI_YEnumComboBox_type"),
+				 ExtensionModelPackage.Literals.YENUM_COMBO_BOX__DEFAULT_LITERAL,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This returns YEnumComboBox.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -290,6 +313,7 @@
 			case ExtensionModelPackage.YENUM_COMBO_BOX__TYPE:
 			case ExtensionModelPackage.YENUM_COMBO_BOX__EMF_NS_URI:
 			case ExtensionModelPackage.YENUM_COMBO_BOX__TYPE_QUALIFIED_NAME:
+			case ExtensionModelPackage.YENUM_COMBO_BOX__DEFAULT_LITERAL:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSuggestTextFieldItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSuggestTextFieldItemProvider.java
index af48f5a..dc885a4 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSuggestTextFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSuggestTextFieldItemProvider.java
@@ -63,6 +63,7 @@
 			addValueBindingEndpointPropertyDescriptor(object);
 			addLastFocusEventPropertyDescriptor(object);
 			addLastBlurEventPropertyDescriptor(object);
+			addSelectionBindingEndpointPropertyDescriptor(object);
 			addDatatypePropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
@@ -73,10 +74,11 @@
 			addTypePropertyDescriptor(object);
 			addEmfNsURIPropertyDescriptor(object);
 			addTypeQualifiedNamePropertyDescriptor(object);
+			addEventPropertyDescriptor(object);
 			addItemCaptionPropertyPropertyDescriptor(object);
 			addItemFilterPropertyPropertyDescriptor(object);
 			addItemUUIDPropertyPropertyDescriptor(object);
-			addEventPropertyDescriptor(object);
+			addCurrentValueDTOPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -148,6 +150,28 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Selection Binding Endpoint feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSelectionBindingEndpointPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YSelectionBindable_selectionBindingEndpoint_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YSelectionBindable_selectionBindingEndpoint_feature", "_UI_YSelectionBindable_type"),
+				 CoreModelPackage.Literals.YSELECTION_BINDABLE__SELECTION_BINDING_ENDPOINT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datatype feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -434,6 +458,28 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Current Value DTO feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addCurrentValueDTOPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YSuggestTextField_currentValueDTO_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YSuggestTextField_currentValueDTO_feature", "_UI_YSuggestTextField_type"),
+				 ExtensionModelPackage.Literals.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Event feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -501,10 +547,11 @@
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
-			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore b/org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore
index a44238d..bc3bdc4 100644
--- a/org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore
+++ b/org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore
@@ -1,765 +1,2021 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="extension" nsURI="http://osbp.eclipse.org/ecview/v1/extension/view"
+<ecore:EPackage
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    name="extension"
+    nsURI="http://osbp.eclipse.org/ecview/v1/extension/view"
     nsPrefix="extension">
-  <eClassifiers xsi:type="ecore:EClass" name="YInput" abstract="true" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YField"/>
-  <eClassifiers xsi:type="ecore:EClass" name="YGridLayout" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
-    <eOperations name="addGridLayoutCellStyle" eType="#//YGridLayoutCellStyle">
-      <eParameters name="element" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YInput"
+      abstract="true"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YField"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YGridLayout"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
+    <eOperations
+        name="addGridLayoutCellStyle"
+        eType="#//YGridLayoutCellStyle">
+      <eParameters
+          name="element"
+          eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cellStyles" upperBound="-1"
-        eType="#//YGridLayoutCellStyle" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="columns" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The number of columns the GridLayout should contain.&#x9;"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="cellStyles"
+        upperBound="-1"
+        eType="#//YGridLayoutCellStyle"
+        containment="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="columns"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The number of columns the GridLayout should contain.&#x9;"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YGridLayoutCellStyle">
-    <eOperations name="addSpanInfo" eType="#//YSpanInfo">
-      <eParameters name="col1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="row1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="col2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="row2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YGridLayoutCellStyle">
+    <eOperations
+        name="addSpanInfo"
+        eType="#//YSpanInfo">
+      <eParameters
+          name="col1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eParameters
+          name="row1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eParameters
+          name="col2"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eParameters
+          name="row2"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="target"
+        lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="alignment"
+        eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
         defaultValueLiteral="UNDEFINED">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alignment of the ui element relative to its grid cell."/>
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The alignment of the ui element relative to its grid cell."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="spanInfo" eType="#//YSpanInfo"
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="spanInfo"
+        eType="#//YSpanInfo"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YHorizontalLayout" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
-    <eOperations name="getCellStyle" eType="#//YHorizontalLayoutCellStyle">
-      <eParameters name="element" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YHorizontalLayout"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
+    <eOperations
+        name="getCellStyle"
+        eType="#//YHorizontalLayoutCellStyle">
+      <eParameters
+          name="element"
+          eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cellStyles" upperBound="-1"
-        eType="#//YHorizontalLayoutCellStyle" containment="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="cellStyles"
+        upperBound="-1"
+        eType="#//YHorizontalLayoutCellStyle"
+        containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YHorizontalLayoutCellStyle">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YHorizontalLayoutCellStyle">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="target"
+        lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="alignment"
+        eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
         defaultValueLiteral="UNDEFINED">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alignment of the ui element relative to its grid cell."/>
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The alignment of the ui element relative to its grid cell."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YVerticalLayout" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cellStyles" upperBound="-1"
-        eType="#//YVerticalLayoutCellStyle" containment="true"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YVerticalLayout"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="cellStyles"
+        upperBound="-1"
+        eType="#//YVerticalLayoutCellStyle"
+        containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YVerticalLayoutCellStyle">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YVerticalLayoutCellStyle">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="target"
+        lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="alignment"
+        eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
         defaultValueLiteral="UNDEFINED">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alignment of the ui element relative to its grid cell."/>
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The alignment of the ui element relative to its grid cell."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YSpanInfo">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnFrom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The column index of the cell that should contain the Upper-Left-Edge of the element."/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YSpanInfo">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="columnFrom"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The column index of the cell that should contain the Upper-Left-Edge of the element."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rowFrom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The row index of the cell that should contain the Upper-Left-Edge of the element."/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="rowFrom"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The row index of the cell that should contain the Upper-Left-Edge of the element."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnTo" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The column index of the cell that should contain the Lower-Right-Edge of the element."/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="columnTo"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The column index of the cell that should contain the Lower-Right-Edge of the element."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rowTo" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The row index of the cell that should contain the Lower-Right-Edge of the element."/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="rowTo"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The row index of the cell that should contain the Lower-Right-Edge of the element."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YTable" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable #//YBeanServiceConsumer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YTableDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectionType" eType="#//YSelectionType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiSelection" upperBound="-1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YTable"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable #//YBeanServiceConsumer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YTableDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selectionType"
+        eType="#//YSelectionType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collection" upperBound="-1"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="multiSelection"
+        upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true" unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="collection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"
+        unsettable="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="columns" upperBound="-1"
-        eType="#//YColumn" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="itemImageProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refresh" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sortOrder" upperBound="-1"
-        eType="#//YSortColumn" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="doSort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scrollToBottom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pageLength" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YColumn" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="orphanDatadescriptions"
-        upperBound="-1" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="columns"
+        upperBound="-1"
+        eType="#//YColumn"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="itemImageProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="filter"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="refresh"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="sortOrder"
+        upperBound="-1"
+        eType="#//YSortColumn"
+        containment="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="doSort"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="scrollToBottom"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="pageLength"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YColumn"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="icon"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="visible"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="orphanDatadescriptions"
+        upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"
+        containment="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="orderable"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="collapsed"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="collapsible"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFlatAlignment"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="alignment"
+        eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFlatAlignment"
         defaultValueLiteral="LEFT"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="expandRatio" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="expandRatio"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"
         defaultValueLiteral="-1.0f"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="converter" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YConverter"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="converter"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YConverter"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YSortColumn" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YSortColumn"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="asc" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="asc"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YTree" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable #//YBeanServiceConsumer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YTreeDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectionType" eType="#//YSelectionType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiSelection" upperBound="-1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YTree"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable #//YBeanServiceConsumer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YTreeDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selectionType"
+        eType="#//YSelectionType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collection" upperBound="-1"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="multiSelection"
+        upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="collection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YOptionsGroup" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable #//YBeanServiceConsumer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YOptionsGroupDataType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectionType" eType="#//YSelectionType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiSelection" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collection" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
-        <eTypeArguments/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="captionProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="imageProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descriptionProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YList" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable #//YBeanServiceConsumer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YListDataType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectionType" eType="#//YSelectionType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiSelection" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collection" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
-        <eTypeArguments/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="captionProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="imageProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descriptionProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YLabel" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YField ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YImage" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YField ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YTextField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YTextChangeNotifier">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YTextDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YBeanReferenceField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable #//YBeanServiceConsumer ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
-        <eTypeArguments/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inMemoryBeanProvider">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
-        <eTypeArguments/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inMemoryBeanProviderQualifiedName"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="captionPropertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="imagePropertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descriptionProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceSourceType">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YOptionsGroup"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable #//YBeanServiceConsumer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YOptionsGroupDataType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selectionType"
+        eType="#//YSelectionType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="multiSelection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="collection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceSourceTypeQualifiedName"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceSourceTypeProperty"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="filteringComponent" eType="#//YFilteringComponent"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="captionProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="imageProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="descriptionProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="description"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YList"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable #//YBeanServiceConsumer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YListDataType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selectionType"
+        eType="#//YSelectionType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="multiSelection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="collection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="captionProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="imageProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="descriptionProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="description"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YLabel"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YField ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YImage"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YField ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="resource"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YTextField"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YTextChangeNotifier">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YTextDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YBeanReferenceField"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable #//YBeanServiceConsumer ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="inMemoryBeanProvider">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="inMemoryBeanProviderQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="captionPropertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="imagePropertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="descriptionProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="description"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="referenceSourceType">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="referenceSourceTypeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="referenceSourceTypeProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="required"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="filteringComponent"
+        eType="#//YFilteringComponent"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dialogComponent" eType="#//YDialogComponent"
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="dialogComponent"
+        eType="#//YDialogComponent"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YTextArea" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YTextChangeNotifier">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YTextAreaDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YTextArea"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YTextChangeNotifier">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YTextAreaDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wordWrap" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="wordWrap"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rows" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="rows"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="3"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YCheckBox" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YCheckBoxDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YCheckBox"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YCheckBoxDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YBrowser" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YBrowserDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YDateTime" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YDateTimeDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YDecimalField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YDecimalDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YNumericField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YNumericDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YComboBox" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable #//YBeanServiceConsumer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YComboBoxDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collection" upperBound="-1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YBrowser"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YBrowserDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YDateTime"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YDateTimeDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YDecimalField"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YDecimalDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YNumericField"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YNumericDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YComboBox"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable #//YBeanServiceConsumer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YComboBoxDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="collection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="captionProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="imageProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="descriptionProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelSelectionType">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="captionProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="imageProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="descriptionProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="description"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="modelSelectionType">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelSelectionTypeQualifiedName"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="modelSelectionTypeQualifiedName"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YButton" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAction ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YVisibleable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEditable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEnable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
-    <eOperations name="addClickListener">
-      <eParameters name="listener" eType="#//YButtonClickListener"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YButton"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAction ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YVisibleable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEditable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEnable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
+    <eOperations
+        name="addClickListener">
+      <eParameters
+          name="listener"
+          eType="#//YButtonClickListener"/>
     </eOperations>
-    <eOperations name="removeClickListener">
-      <eParameters name="listener" eType="#//YButtonClickListener"/>
+    <eOperations
+        name="removeClickListener">
+      <eParameters
+          name="listener"
+          eType="#//YButtonClickListener"/>
     </eOperations>
-    <eOperations name="createClickEndpoint" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/binding.ecore#//YECViewModelValueBindingEndpoint"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="clickListeners" upperBound="-1"
-        eType="#//YButtonClickListener" transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastClickTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="image" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YSlider" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+    <eOperations
+        name="createClickEndpoint"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/binding.ecore#//YECViewModelValueBindingEndpoint"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="clickListeners"
+        upperBound="-1"
+        eType="#//YButtonClickListener"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
-        transient="true" defaultValueLiteral="100"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
-        transient="true" defaultValueLiteral="0"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resolution" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        transient="true" defaultValueLiteral="10"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="orientation" eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YOrientation"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="lastClickTime"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="image"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YSlider"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="maxValue"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        transient="true"
+        defaultValueLiteral="100"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="minValue"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        transient="true"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="resolution"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        transient="true"
+        defaultValueLiteral="10"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="orientation"
+        eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YOrientation"
         transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="YButtonClickListener" instanceClassName="org.eclipse.osbp.ecview.core.extension.model.extension.listener.YButtonClickListener"/>
-  <eClassifiers xsi:type="ecore:EClass" name="YToggleButton" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAction ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YActivateable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+  <eClassifiers
+      xsi:type="ecore:EDataType"
+      name="YButtonClickListener"
+      instanceClassName="org.eclipse.osbp.ecview.core.extension.model.extension.listener.YButtonClickListener"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YToggleButton"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAction ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YActivateable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="YSelectionType">
-    <eLiterals name="SINGLE" literal=""/>
-    <eLiterals name="MULTI" value="1" literal="MULTI"/>
+  <eClassifiers
+      xsi:type="ecore:EEnum"
+      name="YSelectionType">
+    <eLiterals
+        name="SINGLE"
+        literal=""/>
+    <eLiterals
+        name="MULTI"
+        value="1"
+        literal="MULTI"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YProgressBar" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YProgressBarDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YProgressBar"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YProgressBarDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"
         transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YTabSheet" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tabs" upperBound="-1" eType="#//YTab"
-        containment="true" eOpposite="#//YTab/parent"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YTabSheet"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="tabs"
+        upperBound="-1"
+        eType="#//YTab"
+        containment="true"
+        eOpposite="#//YTab/parent"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YTab" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCssAble">
-    <eOperations name="getView" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YView"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" lowerBound="1"
-        eType="#//YTabSheet" eOpposite="#//YTabSheet/tabs"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="embeddable" lowerBound="1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YTab"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCssAble">
+    <eOperations
+        name="getView"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YView"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="parent"
+        lowerBound="1"
+        eType="#//YTabSheet"
+        eOpposite="#//YTabSheet/tabs"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="embeddable"
+        lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="orphanDatadescriptions"
-        upperBound="-1" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="orphanDatadescriptions"
+        upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YMasterDetail" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YMasterDetailDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collection" upperBound="-1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YMasterDetail"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YMasterDetailDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="collection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="masterElement" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="masterElement"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="detailElement" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="detailElement"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YFormLayout" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cellStyles" upperBound="-1"
-        eType="#//YFormLayoutCellStyle" containment="true"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YFormLayout"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="cellStyles"
+        upperBound="-1"
+        eType="#//YFormLayoutCellStyle"
+        containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YFormLayoutCellStyle">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YFormLayoutCellStyle">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="target"
+        lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="alignment"
+        eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
         defaultValueLiteral="UNDEFINED">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alignment of the ui element relative to its grid cell."/>
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The alignment of the ui element relative to its grid cell."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YSearchField" abstract="true" interface="true"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YSearchField"
+      abstract="true"
+      interface="true"
       eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable"/>
-  <eClassifiers xsi:type="ecore:EClass" name="YTextSearchField" eSuperTypes="#//YSearchField">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YTextSearchField"
+      eSuperTypes="#//YSearchField">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wildcard" eType="#//YSearchWildcards"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="wildcard"
+        eType="#//YSearchWildcards"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YBooleanSearchField" eSuperTypes="#//YSearchField">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//YBooleanSearchOption"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YBooleanSearchField"
+      eSuperTypes="#//YSearchField">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="#//YBooleanSearchOption"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YNumericSearchField" eSuperTypes="#//YSearchField">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YNumericSearchField"
+      eSuperTypes="#//YSearchField">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wildcard" eType="#//YSearchWildcards"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="wildcard"
+        eType="#//YSearchWildcards"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YReferenceSearchField" eSuperTypes="#//YSearchField">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YReferenceSearchField"
+      eSuperTypes="#//YSearchField">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wildcard" eType="#//YSearchWildcards"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="wildcard"
+        eType="#//YSearchWildcards"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="YBooleanSearchOption">
-    <eLiterals name="TRUE" literal="TRUE"/>
-    <eLiterals name="FALSE" value="1" literal="FALSE"/>
-    <eLiterals name="IGNORE" value="2" literal="IGNORE"/>
+  <eClassifiers
+      xsi:type="ecore:EEnum"
+      name="YBooleanSearchOption">
+    <eLiterals
+        name="TRUE"
+        literal="TRUE"/>
+    <eLiterals
+        name="FALSE"
+        value="1"
+        literal="FALSE"/>
+    <eLiterals
+        name="IGNORE"
+        value="2"
+        literal="IGNORE"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="YSearchWildcards">
-    <eLiterals name="GT" literal="GT"/>
-    <eLiterals name="GE" value="1" literal="GE"/>
-    <eLiterals name="LT" value="2" literal="LT"/>
-    <eLiterals name="LE" value="3" literal="LE"/>
-    <eLiterals name="EQ" value="4" literal="EQ"/>
-    <eLiterals name="NE" value="5" literal="NE"/>
-    <eLiterals name="ANY" value="6" literal="ANY"/>
+  <eClassifiers
+      xsi:type="ecore:EEnum"
+      name="YSearchWildcards">
+    <eLiterals
+        name="GT"
+        literal="GT"/>
+    <eLiterals
+        name="GE"
+        value="1"
+        literal="GE"/>
+    <eLiterals
+        name="LT"
+        value="2"
+        literal="LT"/>
+    <eLiterals
+        name="LE"
+        value="3"
+        literal="LE"/>
+    <eLiterals
+        name="EQ"
+        value="4"
+        literal="EQ"/>
+    <eLiterals
+        name="NE"
+        value="5"
+        literal="NE"/>
+    <eLiterals
+        name="ANY"
+        value="6"
+        literal="ANY"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YPanel" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable">
-    <eOperations name="getCellStyle" eType="#//YHorizontalLayoutCellStyle">
-      <eParameters name="element" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YPanel"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable">
+    <eOperations
+        name="getCellStyle"
+        eType="#//YHorizontalLayoutCellStyle">
+      <eParameters
+          name="element"
+          eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="firstContent" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="secondContent" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="firstContent"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="secondContent"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YSplitPanel" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout">
-    <eOperations name="getCellStyle" eType="#//YHorizontalLayoutCellStyle">
-      <eParameters name="element" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YSplitPanel"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout">
+    <eOperations
+        name="getCellStyle"
+        eType="#//YHorizontalLayoutCellStyle">
+      <eParameters
+          name="element"
+          eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cellStyles" upperBound="-1"
-        eType="#//YHorizontalLayoutCellStyle" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fillHorizontal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="cellStyles"
+        upperBound="-1"
+        eType="#//YHorizontalLayoutCellStyle"
+        containment="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="fillHorizontal"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If false, then the width of all elements contained in the grid layout will be decreased to their preferred width or their miminum width. If no alignment is defined for a child, this setting will become its default.&#xA;Eg if child has not a alignment, the horizontal alignment will become FILL if fillHorizontal is true. Otherwise the ui-kit default will be used as the horizontal alignment."/>
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="If false, then the width of all elements contained in the grid layout will be decreased to their preferred width or their miminum width. If no alignment is defined for a child, this setting will become its default.&#xA;Eg if child has not a alignment, the horizontal alignment will become FILL if fillHorizontal is true. Otherwise the ui-kit default will be used as the horizontal alignment."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="splitPosition" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="splitPosition"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="50"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vertical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="vertical"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YSearchPanel" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YSearchPanel"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="applyFilter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YEnumOptionsGroup" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YOptionsGroupDataType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectionType" eType="#//YSelectionType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiSelection" upperBound="-1"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="applyFilter"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
-        <eTypeArguments/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YEnumComboBox" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YComboBoxDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
-        <eTypeArguments/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YEnumList" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YListDataType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectionType" eType="#//YSelectionType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiSelection" upperBound="-1"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="filter"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YEnumOptionsGroup"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YOptionsGroupDataType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selectionType"
+        eType="#//YSelectionType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="multiSelection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YBeanServiceConsumer" abstract="true"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YEnumComboBox"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YComboBoxDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="defaultLiteral"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YEnumList"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMultiSelectionBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YListDataType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selectionType"
+        eType="#//YSelectionType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="multiSelection"
+        upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YBeanServiceConsumer"
+      abstract="true"
       interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useBeanService" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="useBeanService"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YAddToTableCommand" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCommand">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="#//YTable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="trigger" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YAddToTableCommand"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCommand">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="table"
+        eType="#//YTable"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="trigger"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YRemoveFromTableCommand" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCommand">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="#//YTable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="trigger" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YRemoveFromTableCommand"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCommand">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="table"
+        eType="#//YTable"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="trigger"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YBrowserStreamInput">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filename" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inputStream" lowerBound="1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YBrowserStreamInput">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="filename"
+        lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="inputStream"
+        lowerBound="1"
         eType="#//YInputStream"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mimeType" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" transient="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="mimeType"
+        lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="YInputStream" instanceClassName="java.io.InputStream"/>
-  <eClassifiers xsi:type="ecore:EClass" name="YSetNewBeanInstanceCommand" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCommand">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/binding.ecore#//YValueBindingEndpoint"
+  <eClassifiers
+      xsi:type="ecore:EDataType"
+      name="YInputStream"
+      instanceClassName="java.io.InputStream"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YSetNewBeanInstanceCommand"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCommand">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="target"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/binding.ecore#//YValueBindingEndpoint"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="trigger" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="trigger"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YCssLayout" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cellStyles" upperBound="-1"
-        eType="#//YCssLayoutCellStyle" containment="true"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YCssLayout"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignmentContainer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="cellStyles"
+        upperBound="-1"
+        eType="#//YCssLayoutCellStyle"
+        containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YCssLayoutCellStyle">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YCssLayoutCellStyle">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="target"
+        lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="alignment"
+        eType="ecore:EEnum ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YAlignment"
         defaultValueLiteral="UNDEFINED">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The alignment of the ui element relative to its css layout cell."/>
+      <eAnnotations
+          source="http://www.eclipse.org/emf/2002/GenModel">
+        <details
+            key="documentation"
+            value="The alignment of the ui element relative to its css layout cell."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YFilter" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filterValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YFilter"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="filterValue"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YAbsoluteLayout" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cellStyles" upperBound="-1"
-        eType="#//YAbsoluteLayoutCellStyle" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="childResizeEnabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="childMoveEnabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YAbsoluteLayout"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YLayout">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="cellStyles"
+        upperBound="-1"
+        eType="#//YAbsoluteLayoutCellStyle"
+        containment="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="childResizeEnabled"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="childMoveEnabled"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YAbsoluteLayoutCellStyle">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YAbsoluteLayoutCellStyle">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="target"
+        lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="top" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="top"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="-1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bottom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="bottom"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="-1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="left" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="left"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="-1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="right" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="right"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="-1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="zIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="zIndex"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="-1"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YSuggestTextField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YTextDatatype"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YSuggestTextField"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datatype"
+        eType="ecore:EClass extdatatypes.ecore#//YTextDatatype"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keys" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="keys"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useSuggestions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoHidePopup" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastSuggestion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="useSuggestions"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="autoHidePopup"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="lastSuggestion"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="event" eType="#//YSuggestTextFieldEvents"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="event"
+        eType="#//YSuggestTextFieldEvents"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="itemCaptionProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="itemFilterProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="itemUUIDProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currentValueDTO" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="itemCaptionProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="itemFilterProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="itemUUIDProperty"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="currentValueDTO"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="YSuggestTextFieldEvents">
-    <eLiterals name="OPEN_POPUP" literal="OPEN_POPUP"/>
-    <eLiterals name="CLOSE_POPUP" value="1" literal="CLOSE_POPUP"/>
-    <eLiterals name="NAVIGATE_NEXT" value="2" literal="NAVIGATE_NEXT"/>
-    <eLiterals name="NAVIGATE_PREV" value="3" literal="NAVIGATE_PREV"/>
-    <eLiterals name="SELECT" value="4" literal="SELECT"/>
-    <eLiterals name="CLEAR" value="5" literal="CLEAR"/>
-    <eLiterals name="SELECTED" value="6" literal="SELECTED"/>
+  <eClassifiers
+      xsi:type="ecore:EEnum"
+      name="YSuggestTextFieldEvents">
+    <eLiterals
+        name="OPEN_POPUP"
+        literal="OPEN_POPUP"/>
+    <eLiterals
+        name="CLOSE_POPUP"
+        value="1"
+        literal="CLOSE_POPUP"/>
+    <eLiterals
+        name="NAVIGATE_NEXT"
+        value="2"
+        literal="NAVIGATE_NEXT"/>
+    <eLiterals
+        name="NAVIGATE_PREV"
+        value="3"
+        literal="NAVIGATE_PREV"/>
+    <eLiterals
+        name="SELECT"
+        value="4"
+        literal="SELECT"/>
+    <eLiterals
+        name="CLEAR"
+        value="5"
+        literal="CLEAR"/>
+    <eLiterals
+        name="SELECTED"
+        value="6"
+        literal="SELECTED"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YPasswordField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YTextChangeNotifier">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YPasswordField"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YTextChangeNotifier">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="value"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YFilteringComponent" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YFilteringComponent"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YEmbeddable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSpacingable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YMarginable">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="applyFilter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="applyFilter"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resetFilter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="resetFilter"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="filter"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="filterDescriptors" upperBound="-1"
-        eType="#//YFilterDescriptor" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tableDescriptors" upperBound="-1"
-        eType="#//YFilterTableDescriptor" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectionBeanSlotName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="$$intern_searchDialogSelection"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filterCols" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="filterDescriptors"
+        upperBound="-1"
+        eType="#//YFilterDescriptor"
+        containment="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="tableDescriptors"
+        upperBound="-1"
+        eType="#//YFilterTableDescriptor"
+        containment="true"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selectionBeanSlotName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="$$intern_searchDialogSelection"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="filterCols"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="2"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hideGrid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="hideGrid"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YFilterDescriptor" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCssAble">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//YFilteringType"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YFilterDescriptor"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCssAble">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type"
+        eType="#//YFilteringType"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="YFilteringType">
-    <eLiterals name="COMPARE" literal="COMPARE"/>
-    <eLiterals name="RANGE" value="1" literal="RANGE"/>
+  <eClassifiers
+      xsi:type="ecore:EEnum"
+      name="YFilteringType">
+    <eLiterals
+        name="COMPARE"
+        literal="COMPARE"/>
+    <eLiterals
+        name="RANGE"
+        value="1"
+        literal="RANGE"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YFilterTableDescriptor" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCssAble">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YFilterTableDescriptor"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCssAble">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="propertyPath"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YKanban" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable #//YBeanServiceConsumer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectionType" eType="#//YSelectionType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YKanban"
+      eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable #//YBeanServiceConsumer">
+    <eStructuralFeatures
+        xsi:type="ecore:EReference"
+        name="datadescription"
+        eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selectionType"
+        eType="#//YSelectionType"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="selection"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cardECViewId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editDialogId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="doubleClicked" eType="#//YKanbanEvent"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="emfNsURI"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="typeQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="cardECViewId"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="editDialogId"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="doubleClicked"
+        eType="#//YKanbanEvent"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stateChanged" eType="#//YKanbanEvent"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="stateChanged"
+        eType="#//YKanbanEvent"
         transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toRefresh" eType="#//YKanbanEvent"
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="toRefresh"
+        eType="#//YKanbanEvent"
         transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YKanbanVisibilityProcessor" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/visibility.ecore#//YVisibilityProcessor"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="YKanbanEvent" instanceClassName="org.eclipse.osbp.ecview.core.extension.model.extension.YKanbanEvent"/>
-  <eClassifiers xsi:type="ecore:EClass" name="YDialogComponent" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCssAble">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewContextCallback" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YKanbanVisibilityProcessor"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/visibility.ecore#//YVisibilityProcessor"/>
+  <eClassifiers
+      xsi:type="ecore:EDataType"
+      name="YKanbanEvent"
+      instanceClassName="org.eclipse.osbp.ecview.core.extension.model.extension.YKanbanEvent"/>
+  <eClassifiers
+      xsi:type="ecore:EClass"
+      name="YDialogComponent"
+      eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCssAble">
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="viewContextCallback"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="type">
+      <eGenericType
+          eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateCallback" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+    <eStructuralFeatures
+        xsi:type="ecore:EAttribute"
+        name="updateCallback"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/ExtensionModelPackage.java b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/ExtensionModelPackage.java
index 1c8b93c..88e42ad 100644
--- a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/ExtensionModelPackage.java
+++ b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/ExtensionModelPackage.java
@@ -589,6 +589,15 @@
 	int YGRID_LAYOUT__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YGRID_LAYOUT__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Spacing</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -924,6 +933,15 @@
 	int YHORIZONTAL_LAYOUT__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YHORIZONTAL_LAYOUT__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Spacing</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1241,6 +1259,15 @@
 	int YVERTICAL_LAYOUT__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YVERTICAL_LAYOUT__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Spacing</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -9233,6 +9260,15 @@
 	int YFORM_LAYOUT__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YFORM_LAYOUT__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Spacing</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11130,6 +11166,15 @@
 	int YPANEL__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YPANEL__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Layout Idx</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11437,6 +11482,15 @@
 	int YSPLIT_PANEL__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YSPLIT_PANEL__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Datadescription</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11735,6 +11789,15 @@
 	int YSEARCH_PANEL__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YSEARCH_PANEL__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Spacing</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -12521,13 +12584,22 @@
 	int YENUM_COMBO_BOX__TYPE_QUALIFIED_NAME = YINPUT_FEATURE_COUNT + 7;
 
 	/**
+	 * The feature id for the '<em><b>Default Literal</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YENUM_COMBO_BOX__DEFAULT_LITERAL = YINPUT_FEATURE_COUNT + 8;
+
+	/**
 	 * The number of structural features of the '<em>YEnum Combo Box</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int YENUM_COMBO_BOX_FEATURE_COUNT = YINPUT_FEATURE_COUNT + 8;
+	int YENUM_COMBO_BOX_FEATURE_COUNT = YINPUT_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -13454,6 +13526,15 @@
 	int YCSS_LAYOUT__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YCSS_LAYOUT__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Spacing</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -13844,6 +13925,15 @@
 	int YABSOLUTE_LAYOUT__NUMBER_COLUMNS = CoreModelPackage.YLAYOUT__NUMBER_COLUMNS;
 
 	/**
+	 * The feature id for the '<em><b>Save And New</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YABSOLUTE_LAYOUT__SAVE_AND_NEW = CoreModelPackage.YLAYOUT__SAVE_AND_NEW;
+
+	/**
 	 * The feature id for the '<em><b>Cell Styles</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -18819,6 +18909,17 @@
 	EAttribute getYEnumComboBox_TypeQualifiedName();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox#getDefaultLiteral <em>Default Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Default Literal</em>'.
+	 * @see org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox#getDefaultLiteral()
+	 * @see #getYEnumComboBox()
+	 * @generated
+	 */
+	EAttribute getYEnumComboBox_DefaultLiteral();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.extension.model.extension.YBeanServiceConsumer <em>YBean Service Consumer</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -22170,6 +22271,14 @@
 		EAttribute YENUM_COMBO_BOX__TYPE_QUALIFIED_NAME = eINSTANCE.getYEnumComboBox_TypeQualifiedName();
 
 		/**
+		 * The meta object literal for the '<em><b>Default Literal</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YENUM_COMBO_BOX__DEFAULT_LITERAL = eINSTANCE.getYEnumComboBox_DefaultLiteral();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.extension.model.extension.YBeanServiceConsumer <em>YBean Service Consumer</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/YEnumComboBox.java b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/YEnumComboBox.java
index cf73bcf..7d555b6 100644
--- a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/YEnumComboBox.java
+++ b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/YEnumComboBox.java
@@ -35,6 +35,7 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox#getEmfNsURI <em>Emf Ns URI</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox#getDefaultLiteral <em>Default Literal</em>}</li>
  * </ul>
  *
  * @see org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage#getYEnumComboBox()
@@ -198,4 +199,30 @@
 	 */
 	void setTypeQualifiedName(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Default Literal</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Default Literal</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Default Literal</em>' attribute.
+	 * @see #setDefaultLiteral(Object)
+	 * @see org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage#getYEnumComboBox_DefaultLiteral()
+	 * @model transient="true"
+	 * @generated
+	 */
+	Object getDefaultLiteral();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox#getDefaultLiteral <em>Default Literal</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Literal</em>' attribute.
+	 * @see #getDefaultLiteral()
+	 * @generated
+	 */
+	void setDefaultLiteral(Object value);
+
 } // YEnumComboBox
diff --git a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/ExtensionModelPackageImpl.java b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/ExtensionModelPackageImpl.java
index 0b53979..0e2605c 100644
--- a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/ExtensionModelPackageImpl.java
+++ b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/ExtensionModelPackageImpl.java
@@ -3162,6 +3162,15 @@
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYEnumComboBox_DefaultLiteral() {
+		return (EAttribute)yEnumComboBoxEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @return the y bean service consumer
@@ -4673,6 +4682,7 @@
 		createEAttribute(yEnumComboBoxEClass, YENUM_COMBO_BOX__TYPE);
 		createEAttribute(yEnumComboBoxEClass, YENUM_COMBO_BOX__EMF_NS_URI);
 		createEAttribute(yEnumComboBoxEClass, YENUM_COMBO_BOX__TYPE_QUALIFIED_NAME);
+		createEAttribute(yEnumComboBoxEClass, YENUM_COMBO_BOX__DEFAULT_LITERAL);
 
 		yEnumListEClass = createEClass(YENUM_LIST);
 		createEReference(yEnumListEClass, YENUM_LIST__DATADESCRIPTION);
@@ -5387,6 +5397,7 @@
 		initEAttribute(getYEnumComboBox_Type(), g1, "type", null, 0, 1, YEnumComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getYEnumComboBox_EmfNsURI(), ecorePackage.getEString(), "emfNsURI", null, 0, 1, YEnumComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getYEnumComboBox_TypeQualifiedName(), ecorePackage.getEString(), "typeQualifiedName", null, 0, 1, YEnumComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYEnumComboBox_DefaultLiteral(), ecorePackage.getEJavaObject(), "defaultLiteral", null, 0, 1, YEnumComboBox.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(yEnumListEClass, YEnumList.class, "YEnumList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getYEnumList_Datadescription(), theDatatypesPackage.getYDatadescription(), null, "datadescription", null, 0, 1, YEnumList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/YEnumComboBoxImpl.java b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/YEnumComboBoxImpl.java
index 58475ab..80ba816 100644
--- a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/YEnumComboBoxImpl.java
+++ b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/YEnumComboBoxImpl.java
@@ -46,6 +46,7 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YEnumComboBoxImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YEnumComboBoxImpl#getEmfNsURI <em>Emf Ns URI</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YEnumComboBoxImpl#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YEnumComboBoxImpl#getDefaultLiteral <em>Default Literal</em>}</li>
  * </ul>
  *
  * @generated
@@ -162,6 +163,26 @@
 	protected String typeQualifiedName = TYPE_QUALIFIED_NAME_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getDefaultLiteral() <em>Default Literal</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultLiteral()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Object DEFAULT_LITERAL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDefaultLiteral() <em>Default Literal</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultLiteral()
+	 * @generated
+	 * @ordered
+	 */
+	protected Object defaultLiteral = DEFAULT_LITERAL_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @generated
@@ -518,6 +539,27 @@
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getDefaultLiteral() {
+		return defaultLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDefaultLiteral(Object newDefaultLiteral) {
+		Object oldDefaultLiteral = defaultLiteral;
+		defaultLiteral = newDefaultLiteral;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YENUM_COMBO_BOX__DEFAULT_LITERAL, oldDefaultLiteral, defaultLiteral));
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @return the y embeddable selection endpoint
@@ -653,6 +695,8 @@
 				return getEmfNsURI();
 			case ExtensionModelPackage.YENUM_COMBO_BOX__TYPE_QUALIFIED_NAME:
 				return getTypeQualifiedName();
+			case ExtensionModelPackage.YENUM_COMBO_BOX__DEFAULT_LITERAL:
+				return getDefaultLiteral();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -693,6 +737,9 @@
 			case ExtensionModelPackage.YENUM_COMBO_BOX__TYPE_QUALIFIED_NAME:
 				setTypeQualifiedName((String)newValue);
 				return;
+			case ExtensionModelPackage.YENUM_COMBO_BOX__DEFAULT_LITERAL:
+				setDefaultLiteral(newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -731,6 +778,9 @@
 			case ExtensionModelPackage.YENUM_COMBO_BOX__TYPE_QUALIFIED_NAME:
 				setTypeQualifiedName(TYPE_QUALIFIED_NAME_EDEFAULT);
 				return;
+			case ExtensionModelPackage.YENUM_COMBO_BOX__DEFAULT_LITERAL:
+				setDefaultLiteral(DEFAULT_LITERAL_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -762,6 +812,8 @@
 				return EMF_NS_URI_EDEFAULT == null ? emfNsURI != null : !EMF_NS_URI_EDEFAULT.equals(emfNsURI);
 			case ExtensionModelPackage.YENUM_COMBO_BOX__TYPE_QUALIFIED_NAME:
 				return TYPE_QUALIFIED_NAME_EDEFAULT == null ? typeQualifiedName != null : !TYPE_QUALIFIED_NAME_EDEFAULT.equals(typeQualifiedName);
+			case ExtensionModelPackage.YENUM_COMBO_BOX__DEFAULT_LITERAL:
+				return DEFAULT_LITERAL_EDEFAULT == null ? defaultLiteral != null : !DEFAULT_LITERAL_EDEFAULT.equals(defaultLiteral);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -849,6 +901,8 @@
 		result.append(emfNsURI);
 		result.append(", typeQualifiedName: ");
 		result.append(typeQualifiedName);
+		result.append(", defaultLiteral: ");
+		result.append(defaultLiteral);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/YSuggestTextFieldImpl.java b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/YSuggestTextFieldImpl.java
index 507d834..a94c4d0 100644
--- a/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/YSuggestTextFieldImpl.java
+++ b/org.eclipse.osbp.ecview.core.extension.model/src/org/eclipse/osbp/ecview/core/extension/model/extension/impl/YSuggestTextFieldImpl.java
@@ -41,54 +41,34 @@
  * The following features are implemented:
  * </p>
  * <ul>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getValueBindingEndpoint
- * <em>Value Binding Endpoint</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getLastFocusEvent
- * <em>Last Focus Event</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getLastBlurEvent
- * <em>Last Blur Event</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getSelectionBindingEndpoint
- * <em>Selection Binding Endpoint</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getDatatype
- * <em>Datatype</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getDatadescription
- * <em>Datadescription</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getValue
- * <em>Value</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getKeys
- * <em>Keys</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#isUseSuggestions
- * <em>Use Suggestions</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#isAutoHidePopup
- * <em>Auto Hide Popup</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getLastSuggestion
- * <em>Last Suggestion</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getType
- * <em>Type</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getEmfNsURI
- * <em>Emf Ns URI</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getTypeQualifiedName
- * <em>Type Qualified Name</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getEvent
- * <em>Event</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getItemCaptionProperty
- * <em>Item Caption Property</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getItemFilterProperty
- * <em>Item Filter Property</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getItemUUIDProperty
- * <em>Item UUID Property</em>}</li>
- * <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getCurrentValueDTO
- * <em>Current Value DTO</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getValueBindingEndpoint <em>Value Binding Endpoint</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getLastFocusEvent <em>Last Focus Event</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getLastBlurEvent <em>Last Blur Event</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getSelectionBindingEndpoint <em>Selection Binding Endpoint</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getDatatype <em>Datatype</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getDatadescription <em>Datadescription</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getKeys <em>Keys</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#isUseSuggestions <em>Use Suggestions</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#isAutoHidePopup <em>Auto Hide Popup</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getLastSuggestion <em>Last Suggestion</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getEmfNsURI <em>Emf Ns URI</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getEvent <em>Event</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getItemCaptionProperty <em>Item Caption Property</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getItemFilterProperty <em>Item Filter Property</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getItemUUIDProperty <em>Item UUID Property</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.extension.model.extension.impl.YSuggestTextFieldImpl#getCurrentValueDTO <em>Current Value DTO</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class YSuggestTextFieldImpl extends YInputImpl implements YSuggestTextField {
 	/**
-	 * The cached value of the '{@link #getValueBindingEndpoint() <em>Value
-	 * Binding Endpoint</em>}' reference. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getValueBindingEndpoint() <em>Value Binding Endpoint</em>}' reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getValueBindingEndpoint()
 	 * @generated
 	 * @ordered
@@ -96,9 +76,8 @@
 	protected YEmbeddableValueEndpoint valueBindingEndpoint;
 
 	/**
-	 * The cached value of the '{@link #getLastFocusEvent() <em>Last Focus
-	 * Event</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getLastFocusEvent() <em>Last Focus Event</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getLastFocusEvent()
 	 * @generated
 	 * @ordered
@@ -106,9 +85,8 @@
 	protected YEmbeddableEvent lastFocusEvent;
 
 	/**
-	 * The cached value of the '{@link #getLastBlurEvent() <em>Last Blur
-	 * Event</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getLastBlurEvent() <em>Last Blur Event</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getLastBlurEvent()
 	 * @generated
 	 * @ordered
@@ -116,10 +94,9 @@
 	protected YEmbeddableEvent lastBlurEvent;
 
 	/**
-	 * The cached value of the '{@link #getSelectionBindingEndpoint()
-	 * <em>Selection Binding Endpoint</em>}' reference. <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getSelectionBindingEndpoint() <em>Selection Binding Endpoint</em>}' reference.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getSelectionBindingEndpoint()
 	 * @generated
 	 * @ordered
@@ -127,9 +104,8 @@
 	protected YEmbeddableSelectionEndpoint selectionBindingEndpoint;
 
 	/**
-	 * The cached value of the '{@link #getDatatype() <em>Datatype</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDatatype() <em>Datatype</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDatatype()
 	 * @generated
 	 * @ordered
@@ -137,10 +113,9 @@
 	protected YTextDatatype datatype;
 
 	/**
-	 * The cached value of the '{@link #getDatadescription()
-	 * <em>Datadescription</em>}' reference. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getDatadescription() <em>Datadescription</em>}' reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getDatadescription()
 	 * @generated
 	 * @ordered
@@ -150,7 +125,6 @@
 	/**
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -160,7 +134,6 @@
 	/**
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -170,7 +143,6 @@
 	/**
 	 * The default value of the '{@link #getKeys() <em>Keys</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getKeys()
 	 * @generated
 	 * @ordered
@@ -180,7 +152,6 @@
 	/**
 	 * The cached value of the '{@link #getKeys() <em>Keys</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getKeys()
 	 * @generated
 	 * @ordered
@@ -210,9 +181,8 @@
 	protected boolean useSuggestions = USE_SUGGESTIONS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isAutoHidePopup() <em>Auto Hide
-	 * Popup</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #isAutoHidePopup() <em>Auto Hide Popup</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isAutoHidePopup()
 	 * @generated
 	 * @ordered
@@ -220,9 +190,8 @@
 	protected static final boolean AUTO_HIDE_POPUP_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isAutoHidePopup() <em>Auto Hide
-	 * Popup</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #isAutoHidePopup() <em>Auto Hide Popup</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isAutoHidePopup()
 	 * @generated
 	 * @ordered
@@ -254,7 +223,6 @@
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -262,9 +230,8 @@
 	protected Class<?> type;
 
 	/**
-	 * The default value of the '{@link #getEmfNsURI() <em>Emf Ns URI</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getEmfNsURI() <em>Emf Ns URI</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getEmfNsURI()
 	 * @generated
 	 * @ordered
@@ -272,9 +239,8 @@
 	protected static final String EMF_NS_URI_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getEmfNsURI() <em>Emf Ns URI</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getEmfNsURI() <em>Emf Ns URI</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getEmfNsURI()
 	 * @generated
 	 * @ordered
@@ -282,10 +248,9 @@
 	protected String emfNsURI = EMF_NS_URI_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTypeQualifiedName() <em>Type
-	 * Qualified Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getTypeQualifiedName() <em>Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getTypeQualifiedName()
 	 * @generated
 	 * @ordered
@@ -293,10 +258,9 @@
 	protected static final String TYPE_QUALIFIED_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTypeQualifiedName() <em>Type
-	 * Qualified Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getTypeQualifiedName() <em>Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getTypeQualifiedName()
 	 * @generated
 	 * @ordered
@@ -306,7 +270,6 @@
 	/**
 	 * The default value of the '{@link #getEvent() <em>Event</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getEvent()
 	 * @generated
 	 * @ordered
@@ -316,7 +279,6 @@
 	/**
 	 * The cached value of the '{@link #getEvent() <em>Event</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getEvent()
 	 * @generated
 	 * @ordered
@@ -324,10 +286,9 @@
 	protected YSuggestTextFieldEvents event = EVENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getItemCaptionProperty() <em>Item
-	 * Caption Property</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getItemCaptionProperty() <em>Item Caption Property</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getItemCaptionProperty()
 	 * @generated
 	 * @ordered
@@ -335,10 +296,9 @@
 	protected static final String ITEM_CAPTION_PROPERTY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getItemCaptionProperty() <em>Item
-	 * Caption Property</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getItemCaptionProperty() <em>Item Caption Property</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getItemCaptionProperty()
 	 * @generated
 	 * @ordered
@@ -346,9 +306,8 @@
 	protected String itemCaptionProperty = ITEM_CAPTION_PROPERTY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getItemFilterProperty() <em>Item Filter
-	 * Property</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getItemFilterProperty() <em>Item Filter Property</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getItemFilterProperty()
 	 * @generated
 	 * @ordered
@@ -356,9 +315,8 @@
 	protected static final String ITEM_FILTER_PROPERTY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getItemFilterProperty() <em>Item Filter
-	 * Property</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getItemFilterProperty() <em>Item Filter Property</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getItemFilterProperty()
 	 * @generated
 	 * @ordered
@@ -366,9 +324,8 @@
 	protected String itemFilterProperty = ITEM_FILTER_PROPERTY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getItemUUIDProperty() <em>Item UUID
-	 * Property</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getItemUUIDProperty() <em>Item UUID Property</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getItemUUIDProperty()
 	 * @generated
 	 * @ordered
@@ -376,9 +333,8 @@
 	protected static final String ITEM_UUID_PROPERTY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getItemUUIDProperty() <em>Item UUID
-	 * Property</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getItemUUIDProperty() <em>Item UUID Property</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getItemUUIDProperty()
 	 * @generated
 	 * @ordered
@@ -386,9 +342,8 @@
 	protected String itemUUIDProperty = ITEM_UUID_PROPERTY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCurrentValueDTO() <em>Current Value
-	 * DTO</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getCurrentValueDTO() <em>Current Value DTO</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCurrentValueDTO()
 	 * @generated
 	 * @ordered
@@ -396,9 +351,8 @@
 	protected static final Object CURRENT_VALUE_DTO_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCurrentValueDTO() <em>Current Value
-	 * DTO</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getCurrentValueDTO() <em>Current Value DTO</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCurrentValueDTO()
 	 * @generated
 	 * @ordered
@@ -434,13 +388,11 @@
 	 */
 	public YEmbeddableValueEndpoint getValueBindingEndpoint() {
 		if (valueBindingEndpoint != null && valueBindingEndpoint.eIsProxy()) {
-			InternalEObject oldValueBindingEndpoint = (InternalEObject) valueBindingEndpoint;
-			valueBindingEndpoint = (YEmbeddableValueEndpoint) eResolveProxy(oldValueBindingEndpoint);
+			InternalEObject oldValueBindingEndpoint = (InternalEObject)valueBindingEndpoint;
+			valueBindingEndpoint = (YEmbeddableValueEndpoint)eResolveProxy(oldValueBindingEndpoint);
 			if (valueBindingEndpoint != oldValueBindingEndpoint) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT, oldValueBindingEndpoint,
-							valueBindingEndpoint));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT, oldValueBindingEndpoint, valueBindingEndpoint));
 			}
 		}
 		return valueBindingEndpoint;
@@ -471,13 +423,8 @@
 		YEmbeddableValueEndpoint oldValueBindingEndpoint = valueBindingEndpoint;
 		valueBindingEndpoint = newValueBindingEndpoint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT, oldValueBindingEndpoint,
-					newValueBindingEndpoint);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT, oldValueBindingEndpoint, newValueBindingEndpoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -495,34 +442,27 @@
 		if (newValueBindingEndpoint != valueBindingEndpoint) {
 			NotificationChain msgs = null;
 			if (valueBindingEndpoint != null)
-				msgs = ((InternalEObject) valueBindingEndpoint).eInverseRemove(this,
-						CoreModelPackage.YEMBEDDABLE_VALUE_ENDPOINT__ELEMENT, YEmbeddableValueEndpoint.class, msgs);
+				msgs = ((InternalEObject)valueBindingEndpoint).eInverseRemove(this, CoreModelPackage.YEMBEDDABLE_VALUE_ENDPOINT__ELEMENT, YEmbeddableValueEndpoint.class, msgs);
 			if (newValueBindingEndpoint != null)
-				msgs = ((InternalEObject) newValueBindingEndpoint).eInverseAdd(this,
-						CoreModelPackage.YEMBEDDABLE_VALUE_ENDPOINT__ELEMENT, YEmbeddableValueEndpoint.class, msgs);
+				msgs = ((InternalEObject)newValueBindingEndpoint).eInverseAdd(this, CoreModelPackage.YEMBEDDABLE_VALUE_ENDPOINT__ELEMENT, YEmbeddableValueEndpoint.class, msgs);
 			msgs = basicSetValueBindingEndpoint(newValueBindingEndpoint, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT, newValueBindingEndpoint,
-					newValueBindingEndpoint));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT, newValueBindingEndpoint, newValueBindingEndpoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public YEmbeddableEvent getLastFocusEvent() {
 		if (lastFocusEvent != null && lastFocusEvent.eIsProxy()) {
-			InternalEObject oldLastFocusEvent = (InternalEObject) lastFocusEvent;
-			lastFocusEvent = (YEmbeddableEvent) eResolveProxy(oldLastFocusEvent);
+			InternalEObject oldLastFocusEvent = (InternalEObject)lastFocusEvent;
+			lastFocusEvent = (YEmbeddableEvent)eResolveProxy(oldLastFocusEvent);
 			if (lastFocusEvent != oldLastFocusEvent) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT, oldLastFocusEvent,
-							lastFocusEvent));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT, oldLastFocusEvent, lastFocusEvent));
 			}
 		}
 		return lastFocusEvent;
@@ -530,7 +470,6 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public YEmbeddableEvent basicGetLastFocusEvent() {
@@ -539,31 +478,26 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setLastFocusEvent(YEmbeddableEvent newLastFocusEvent) {
 		YEmbeddableEvent oldLastFocusEvent = lastFocusEvent;
 		lastFocusEvent = newLastFocusEvent;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT, oldLastFocusEvent, lastFocusEvent));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT, oldLastFocusEvent, lastFocusEvent));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public YEmbeddableEvent getLastBlurEvent() {
 		if (lastBlurEvent != null && lastBlurEvent.eIsProxy()) {
-			InternalEObject oldLastBlurEvent = (InternalEObject) lastBlurEvent;
-			lastBlurEvent = (YEmbeddableEvent) eResolveProxy(oldLastBlurEvent);
+			InternalEObject oldLastBlurEvent = (InternalEObject)lastBlurEvent;
+			lastBlurEvent = (YEmbeddableEvent)eResolveProxy(oldLastBlurEvent);
 			if (lastBlurEvent != oldLastBlurEvent) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT, oldLastBlurEvent,
-							lastBlurEvent));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT, oldLastBlurEvent, lastBlurEvent));
 			}
 		}
 		return lastBlurEvent;
@@ -571,7 +505,6 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public YEmbeddableEvent basicGetLastBlurEvent() {
@@ -580,31 +513,26 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setLastBlurEvent(YEmbeddableEvent newLastBlurEvent) {
 		YEmbeddableEvent oldLastBlurEvent = lastBlurEvent;
 		lastBlurEvent = newLastBlurEvent;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT, oldLastBlurEvent, lastBlurEvent));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT, oldLastBlurEvent, lastBlurEvent));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public YEmbeddableSelectionEndpoint getSelectionBindingEndpoint() {
 		if (selectionBindingEndpoint != null && selectionBindingEndpoint.eIsProxy()) {
-			InternalEObject oldSelectionBindingEndpoint = (InternalEObject) selectionBindingEndpoint;
-			selectionBindingEndpoint = (YEmbeddableSelectionEndpoint) eResolveProxy(oldSelectionBindingEndpoint);
+			InternalEObject oldSelectionBindingEndpoint = (InternalEObject)selectionBindingEndpoint;
+			selectionBindingEndpoint = (YEmbeddableSelectionEndpoint)eResolveProxy(oldSelectionBindingEndpoint);
 			if (selectionBindingEndpoint != oldSelectionBindingEndpoint) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT,
-							oldSelectionBindingEndpoint, selectionBindingEndpoint));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT, oldSelectionBindingEndpoint, selectionBindingEndpoint));
 			}
 		}
 		return selectionBindingEndpoint;
@@ -612,7 +540,6 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public YEmbeddableSelectionEndpoint basicGetSelectionBindingEndpoint() {
@@ -621,7 +548,6 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetSelectionBindingEndpoint(YEmbeddableSelectionEndpoint newSelectionBindingEndpoint,
@@ -629,40 +555,28 @@
 		YEmbeddableSelectionEndpoint oldSelectionBindingEndpoint = selectionBindingEndpoint;
 		selectionBindingEndpoint = newSelectionBindingEndpoint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT, oldSelectionBindingEndpoint,
-					newSelectionBindingEndpoint);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT, oldSelectionBindingEndpoint, newSelectionBindingEndpoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setSelectionBindingEndpoint(YEmbeddableSelectionEndpoint newSelectionBindingEndpoint) {
 		if (newSelectionBindingEndpoint != selectionBindingEndpoint) {
 			NotificationChain msgs = null;
 			if (selectionBindingEndpoint != null)
-				msgs = ((InternalEObject) selectionBindingEndpoint).eInverseRemove(this,
-						CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class,
-						msgs);
+				msgs = ((InternalEObject)selectionBindingEndpoint).eInverseRemove(this, CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class, msgs);
 			if (newSelectionBindingEndpoint != null)
-				msgs = ((InternalEObject) newSelectionBindingEndpoint).eInverseAdd(this,
-						CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class,
-						msgs);
+				msgs = ((InternalEObject)newSelectionBindingEndpoint).eInverseAdd(this, CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class, msgs);
 			msgs = basicSetSelectionBindingEndpoint(newSelectionBindingEndpoint, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT, newSelectionBindingEndpoint,
-					newSelectionBindingEndpoint));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT, newSelectionBindingEndpoint, newSelectionBindingEndpoint));
 	}
 
 	/**
@@ -674,12 +588,11 @@
 	 */
 	public YTextDatatype getDatatype() {
 		if (datatype != null && datatype.eIsProxy()) {
-			InternalEObject oldDatatype = (InternalEObject) datatype;
-			datatype = (YTextDatatype) eResolveProxy(oldDatatype);
+			InternalEObject oldDatatype = (InternalEObject)datatype;
+			datatype = (YTextDatatype)eResolveProxy(oldDatatype);
 			if (datatype != oldDatatype) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE, oldDatatype, datatype));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE, oldDatatype, datatype));
 			}
 		}
 		return datatype;
@@ -707,8 +620,7 @@
 		YTextDatatype oldDatatype = datatype;
 		datatype = newDatatype;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE,
-					oldDatatype, datatype));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE, oldDatatype, datatype));
 	}
 
 	/**
@@ -720,13 +632,11 @@
 	 */
 	public YDatadescription getDatadescription() {
 		if (datadescription != null && datadescription.eIsProxy()) {
-			InternalEObject oldDatadescription = (InternalEObject) datadescription;
-			datadescription = (YDatadescription) eResolveProxy(oldDatadescription);
+			InternalEObject oldDatadescription = (InternalEObject)datadescription;
+			datadescription = (YDatadescription)eResolveProxy(oldDatadescription);
 			if (datadescription != oldDatadescription) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION, oldDatadescription,
-							datadescription));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION, oldDatadescription, datadescription));
 			}
 		}
 		return datadescription;
@@ -754,8 +664,7 @@
 		YDatadescription oldDatadescription = datadescription;
 		datadescription = newDatadescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION, oldDatadescription, datadescription));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION, oldDatadescription, datadescription));
 	}
 
 	/**
@@ -781,13 +690,11 @@
 		String oldValue = value;
 		value = newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE,
-					oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE, oldValue, value));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getKeys() {
@@ -796,15 +703,13 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setKeys(String newKeys) {
 		String oldKeys = keys;
 		keys = newKeys;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS,
-					oldKeys, keys));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS, oldKeys, keys));
 	}
 
 	/**
@@ -830,13 +735,11 @@
 		boolean oldUseSuggestions = useSuggestions;
 		useSuggestions = newUseSuggestions;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS, oldUseSuggestions, useSuggestions));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS, oldUseSuggestions, useSuggestions));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isAutoHidePopup() {
@@ -845,15 +748,13 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setAutoHidePopup(boolean newAutoHidePopup) {
 		boolean oldAutoHidePopup = autoHidePopup;
 		autoHidePopup = newAutoHidePopup;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP, oldAutoHidePopup, autoHidePopup));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP, oldAutoHidePopup, autoHidePopup));
 	}
 
 	/**
@@ -879,8 +780,7 @@
 		Object oldLastSuggestion = lastSuggestion;
 		lastSuggestion = newLastSuggestion;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION, oldLastSuggestion, lastSuggestion));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION, oldLastSuggestion, lastSuggestion));
 	}
 
 	/**
@@ -906,8 +806,7 @@
 		Class<?> oldType = type;
 		type = newType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE,
-					oldType, type));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE, oldType, type));
 	}
 
 	/**
@@ -933,8 +832,7 @@
 		String oldEmfNsURI = emfNsURI;
 		emfNsURI = newEmfNsURI;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI,
-					oldEmfNsURI, emfNsURI));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI, oldEmfNsURI, emfNsURI));
 	}
 
 	/**
@@ -960,9 +858,7 @@
 		String oldTypeQualifiedName = typeQualifiedName;
 		typeQualifiedName = newTypeQualifiedName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME, oldTypeQualifiedName,
-					typeQualifiedName));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME, oldTypeQualifiedName, typeQualifiedName));
 	}
 
 	/**
@@ -988,9 +884,7 @@
 		String oldItemCaptionProperty = itemCaptionProperty;
 		itemCaptionProperty = newItemCaptionProperty;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY, oldItemCaptionProperty,
-					itemCaptionProperty));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY, oldItemCaptionProperty, itemCaptionProperty));
 	}
 
 	/**
@@ -1016,9 +910,7 @@
 		String oldItemFilterProperty = itemFilterProperty;
 		itemFilterProperty = newItemFilterProperty;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY, oldItemFilterProperty,
-					itemFilterProperty));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY, oldItemFilterProperty, itemFilterProperty));
 	}
 
 	/**
@@ -1044,14 +936,11 @@
 		String oldItemUUIDProperty = itemUUIDProperty;
 		itemUUIDProperty = newItemUUIDProperty;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY, oldItemUUIDProperty,
-					itemUUIDProperty));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY, oldItemUUIDProperty, itemUUIDProperty));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Object getCurrentValueDTO() {
@@ -1060,15 +949,13 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setCurrentValueDTO(Object newCurrentValueDTO) {
 		Object oldCurrentValueDTO = currentValueDTO;
 		currentValueDTO = newCurrentValueDTO;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO, oldCurrentValueDTO, currentValueDTO));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO, oldCurrentValueDTO, currentValueDTO));
 	}
 
 	/**
@@ -1083,7 +970,6 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public YSuggestTextFieldEvents getEvent() {
@@ -1092,15 +978,13 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setEvent(YSuggestTextFieldEvents newEvent) {
 		YSuggestTextFieldEvents oldEvent = event;
 		event = newEvent == null ? EVENT_EDEFAULT : newEvent;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT,
-					oldEvent, event));
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT, oldEvent, event));
 	}
 
 	/**
@@ -1129,17 +1013,14 @@
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
-			if (valueBindingEndpoint != null)
-				msgs = ((InternalEObject) valueBindingEndpoint).eInverseRemove(this,
-						CoreModelPackage.YEMBEDDABLE_VALUE_ENDPOINT__ELEMENT, YEmbeddableValueEndpoint.class, msgs);
-			return basicSetValueBindingEndpoint((YEmbeddableValueEndpoint) otherEnd, msgs);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
-			if (selectionBindingEndpoint != null)
-				msgs = ((InternalEObject) selectionBindingEndpoint).eInverseRemove(this,
-						CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class,
-						msgs);
-			return basicSetSelectionBindingEndpoint((YEmbeddableSelectionEndpoint) otherEnd, msgs);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
+				if (valueBindingEndpoint != null)
+					msgs = ((InternalEObject)valueBindingEndpoint).eInverseRemove(this, CoreModelPackage.YEMBEDDABLE_VALUE_ENDPOINT__ELEMENT, YEmbeddableValueEndpoint.class, msgs);
+				return basicSetValueBindingEndpoint((YEmbeddableValueEndpoint)otherEnd, msgs);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
+				if (selectionBindingEndpoint != null)
+					msgs = ((InternalEObject)selectionBindingEndpoint).eInverseRemove(this, CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class, msgs);
+				return basicSetSelectionBindingEndpoint((YEmbeddableSelectionEndpoint)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -1159,10 +1040,10 @@
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
-			return basicSetValueBindingEndpoint(null, msgs);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
-			return basicSetSelectionBindingEndpoint(null, msgs);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
+				return basicSetValueBindingEndpoint(null, msgs);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
+				return basicSetSelectionBindingEndpoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -1182,56 +1063,50 @@
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
-			if (resolve)
-				return getValueBindingEndpoint();
-			return basicGetValueBindingEndpoint();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
-			if (resolve)
-				return getLastFocusEvent();
-			return basicGetLastFocusEvent();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
-			if (resolve)
-				return getLastBlurEvent();
-			return basicGetLastBlurEvent();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
-			if (resolve)
-				return getSelectionBindingEndpoint();
-			return basicGetSelectionBindingEndpoint();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE:
-			if (resolve)
-				return getDatatype();
-			return basicGetDatatype();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION:
-			if (resolve)
-				return getDatadescription();
-			return basicGetDatadescription();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
-			return getValue();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
-			return getKeys();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
-			return isUseSuggestions();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
-			return isAutoHidePopup();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
-			return getLastSuggestion();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
-			return getType();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
-			return getEmfNsURI();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
-			return getTypeQualifiedName();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
-			return getEvent();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
-			return getItemCaptionProperty();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
-			return getItemFilterProperty();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
-			return getItemUUIDProperty();
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
-			return getCurrentValueDTO();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
+				if (resolve) return getValueBindingEndpoint();
+				return basicGetValueBindingEndpoint();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
+				if (resolve) return getLastFocusEvent();
+				return basicGetLastFocusEvent();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
+				if (resolve) return getLastBlurEvent();
+				return basicGetLastBlurEvent();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
+				if (resolve) return getSelectionBindingEndpoint();
+				return basicGetSelectionBindingEndpoint();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE:
+				if (resolve) return getDatatype();
+				return basicGetDatatype();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION:
+				if (resolve) return getDatadescription();
+				return basicGetDatadescription();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
+				return getValue();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
+				return getKeys();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
+				return isUseSuggestions();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
+				return isAutoHidePopup();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
+				return getLastSuggestion();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
+				return getType();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
+				return getEmfNsURI();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
+				return getTypeQualifiedName();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
+				return getEvent();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
+				return getItemCaptionProperty();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
+				return getItemFilterProperty();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
+				return getItemUUIDProperty();
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
+				return getCurrentValueDTO();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -1248,63 +1123,63 @@
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
-			setValueBindingEndpoint((YEmbeddableValueEndpoint) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
-			setLastFocusEvent((YEmbeddableEvent) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
-			setLastBlurEvent((YEmbeddableEvent) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
-			setSelectionBindingEndpoint((YEmbeddableSelectionEndpoint) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE:
-			setDatatype((YTextDatatype) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION:
-			setDatadescription((YDatadescription) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
-			setValue((String) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
-			setKeys((String) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
-			setUseSuggestions((Boolean) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
-			setAutoHidePopup((Boolean) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
-			setLastSuggestion(newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
-			setType((Class<?>) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
-			setEmfNsURI((String) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
-			setTypeQualifiedName((String) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
-			setEvent((YSuggestTextFieldEvents) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
-			setItemCaptionProperty((String) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
-			setItemFilterProperty((String) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
-			setItemUUIDProperty((String) newValue);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
-			setCurrentValueDTO(newValue);
-			return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
+				setValueBindingEndpoint((YEmbeddableValueEndpoint)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
+				setLastFocusEvent((YEmbeddableEvent)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
+				setLastBlurEvent((YEmbeddableEvent)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
+				setSelectionBindingEndpoint((YEmbeddableSelectionEndpoint)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE:
+				setDatatype((YTextDatatype)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION:
+				setDatadescription((YDatadescription)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
+				setValue((String)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
+				setKeys((String)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
+				setUseSuggestions((Boolean)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
+				setAutoHidePopup((Boolean)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
+				setLastSuggestion(newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
+				setType((Class<?>)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
+				setEmfNsURI((String)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
+				setTypeQualifiedName((String)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
+				setEvent((YSuggestTextFieldEvents)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
+				setItemCaptionProperty((String)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
+				setItemFilterProperty((String)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
+				setItemUUIDProperty((String)newValue);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
+				setCurrentValueDTO(newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -1319,63 +1194,63 @@
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
-			setValueBindingEndpoint((YEmbeddableValueEndpoint) null);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
-			setLastFocusEvent((YEmbeddableEvent) null);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
-			setLastBlurEvent((YEmbeddableEvent) null);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
-			setSelectionBindingEndpoint((YEmbeddableSelectionEndpoint) null);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE:
-			setDatatype((YTextDatatype) null);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION:
-			setDatadescription((YDatadescription) null);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
-			setValue(VALUE_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
-			setKeys(KEYS_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
-			setUseSuggestions(USE_SUGGESTIONS_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
-			setAutoHidePopup(AUTO_HIDE_POPUP_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
-			setLastSuggestion(LAST_SUGGESTION_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
-			setType((Class<?>) null);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
-			setEmfNsURI(EMF_NS_URI_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
-			setTypeQualifiedName(TYPE_QUALIFIED_NAME_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
-			setEvent(EVENT_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
-			setItemCaptionProperty(ITEM_CAPTION_PROPERTY_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
-			setItemFilterProperty(ITEM_FILTER_PROPERTY_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
-			setItemUUIDProperty(ITEM_UUID_PROPERTY_EDEFAULT);
-			return;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
-			setCurrentValueDTO(CURRENT_VALUE_DTO_EDEFAULT);
-			return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
+				setValueBindingEndpoint((YEmbeddableValueEndpoint)null);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
+				setLastFocusEvent((YEmbeddableEvent)null);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
+				setLastBlurEvent((YEmbeddableEvent)null);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
+				setSelectionBindingEndpoint((YEmbeddableSelectionEndpoint)null);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE:
+				setDatatype((YTextDatatype)null);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION:
+				setDatadescription((YDatadescription)null);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
+				setKeys(KEYS_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
+				setUseSuggestions(USE_SUGGESTIONS_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
+				setAutoHidePopup(AUTO_HIDE_POPUP_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
+				setLastSuggestion(LAST_SUGGESTION_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
+				setType((Class<?>)null);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
+				setEmfNsURI(EMF_NS_URI_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
+				setTypeQualifiedName(TYPE_QUALIFIED_NAME_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
+				setEvent(EVENT_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
+				setItemCaptionProperty(ITEM_CAPTION_PROPERTY_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
+				setItemFilterProperty(ITEM_FILTER_PROPERTY_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
+				setItemUUIDProperty(ITEM_UUID_PROPERTY_EDEFAULT);
+				return;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
+				setCurrentValueDTO(CURRENT_VALUE_DTO_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -1391,50 +1266,44 @@
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
-			return valueBindingEndpoint != null;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
-			return lastFocusEvent != null;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
-			return lastBlurEvent != null;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
-			return selectionBindingEndpoint != null;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE:
-			return datatype != null;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION:
-			return datadescription != null;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
-			return KEYS_EDEFAULT == null ? keys != null : !KEYS_EDEFAULT.equals(keys);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
-			return useSuggestions != USE_SUGGESTIONS_EDEFAULT;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
-			return autoHidePopup != AUTO_HIDE_POPUP_EDEFAULT;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
-			return LAST_SUGGESTION_EDEFAULT == null ? lastSuggestion != null
-					: !LAST_SUGGESTION_EDEFAULT.equals(lastSuggestion);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
-			return type != null;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
-			return EMF_NS_URI_EDEFAULT == null ? emfNsURI != null : !EMF_NS_URI_EDEFAULT.equals(emfNsURI);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
-			return TYPE_QUALIFIED_NAME_EDEFAULT == null ? typeQualifiedName != null
-					: !TYPE_QUALIFIED_NAME_EDEFAULT.equals(typeQualifiedName);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
-			return event != EVENT_EDEFAULT;
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
-			return ITEM_CAPTION_PROPERTY_EDEFAULT == null ? itemCaptionProperty != null
-					: !ITEM_CAPTION_PROPERTY_EDEFAULT.equals(itemCaptionProperty);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
-			return ITEM_FILTER_PROPERTY_EDEFAULT == null ? itemFilterProperty != null
-					: !ITEM_FILTER_PROPERTY_EDEFAULT.equals(itemFilterProperty);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
-			return ITEM_UUID_PROPERTY_EDEFAULT == null ? itemUUIDProperty != null
-					: !ITEM_UUID_PROPERTY_EDEFAULT.equals(itemUUIDProperty);
-		case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
-			return CURRENT_VALUE_DTO_EDEFAULT == null ? currentValueDTO != null
-					: !CURRENT_VALUE_DTO_EDEFAULT.equals(currentValueDTO);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
+				return valueBindingEndpoint != null;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
+				return lastFocusEvent != null;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
+				return lastBlurEvent != null;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
+				return selectionBindingEndpoint != null;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATATYPE:
+				return datatype != null;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__DATADESCRIPTION:
+				return datadescription != null;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
+				return KEYS_EDEFAULT == null ? keys != null : !KEYS_EDEFAULT.equals(keys);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
+				return useSuggestions != USE_SUGGESTIONS_EDEFAULT;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
+				return autoHidePopup != AUTO_HIDE_POPUP_EDEFAULT;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
+				return LAST_SUGGESTION_EDEFAULT == null ? lastSuggestion != null : !LAST_SUGGESTION_EDEFAULT.equals(lastSuggestion);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE:
+				return type != null;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EMF_NS_URI:
+				return EMF_NS_URI_EDEFAULT == null ? emfNsURI != null : !EMF_NS_URI_EDEFAULT.equals(emfNsURI);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__TYPE_QUALIFIED_NAME:
+				return TYPE_QUALIFIED_NAME_EDEFAULT == null ? typeQualifiedName != null : !TYPE_QUALIFIED_NAME_EDEFAULT.equals(typeQualifiedName);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__EVENT:
+				return event != EVENT_EDEFAULT;
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_CAPTION_PROPERTY:
+				return ITEM_CAPTION_PROPERTY_EDEFAULT == null ? itemCaptionProperty != null : !ITEM_CAPTION_PROPERTY_EDEFAULT.equals(itemCaptionProperty);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_FILTER_PROPERTY:
+				return ITEM_FILTER_PROPERTY_EDEFAULT == null ? itemFilterProperty != null : !ITEM_FILTER_PROPERTY_EDEFAULT.equals(itemFilterProperty);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__ITEM_UUID_PROPERTY:
+				return ITEM_UUID_PROPERTY_EDEFAULT == null ? itemUUIDProperty != null : !ITEM_UUID_PROPERTY_EDEFAULT.equals(itemUUIDProperty);
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__CURRENT_VALUE_DTO:
+				return CURRENT_VALUE_DTO_EDEFAULT == null ? currentValueDTO != null : !CURRENT_VALUE_DTO_EDEFAULT.equals(currentValueDTO);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -1453,40 +1322,31 @@
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 		if (baseClass == YBindable.class) {
 			switch (derivedFeatureID) {
-			default:
-				return -1;
+				default: return -1;
 			}
 		}
 		if (baseClass == YValueBindable.class) {
 			switch (derivedFeatureID) {
-			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT:
-				return CoreModelPackage.YVALUE_BINDABLE__VALUE_BINDING_ENDPOINT;
-			default:
-				return -1;
+				case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT: return CoreModelPackage.YVALUE_BINDABLE__VALUE_BINDING_ENDPOINT;
+				default: return -1;
 			}
 		}
 		if (baseClass == YFocusNotifier.class) {
 			switch (derivedFeatureID) {
-			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT:
-				return CoreModelPackage.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT;
-			default:
-				return -1;
+				case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT: return CoreModelPackage.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT;
+				default: return -1;
 			}
 		}
 		if (baseClass == YBlurNotifier.class) {
 			switch (derivedFeatureID) {
-			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT:
-				return CoreModelPackage.YBLUR_NOTIFIER__LAST_BLUR_EVENT;
-			default:
-				return -1;
+				case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT: return CoreModelPackage.YBLUR_NOTIFIER__LAST_BLUR_EVENT;
+				default: return -1;
 			}
 		}
 		if (baseClass == YSelectionBindable.class) {
 			switch (derivedFeatureID) {
-			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT:
-				return CoreModelPackage.YSELECTION_BINDABLE__SELECTION_BINDING_ENDPOINT;
-			default:
-				return -1;
+				case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT: return CoreModelPackage.YSELECTION_BINDABLE__SELECTION_BINDING_ENDPOINT;
+				default: return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -1506,40 +1366,31 @@
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 		if (baseClass == YBindable.class) {
 			switch (baseFeatureID) {
-			default:
-				return -1;
+				default: return -1;
 			}
 		}
 		if (baseClass == YValueBindable.class) {
 			switch (baseFeatureID) {
-			case CoreModelPackage.YVALUE_BINDABLE__VALUE_BINDING_ENDPOINT:
-				return ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT;
-			default:
-				return -1;
+				case CoreModelPackage.YVALUE_BINDABLE__VALUE_BINDING_ENDPOINT: return ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE_BINDING_ENDPOINT;
+				default: return -1;
 			}
 		}
 		if (baseClass == YFocusNotifier.class) {
 			switch (baseFeatureID) {
-			case CoreModelPackage.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT:
-				return ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT;
-			default:
-				return -1;
+				case CoreModelPackage.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT: return ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_FOCUS_EVENT;
+				default: return -1;
 			}
 		}
 		if (baseClass == YBlurNotifier.class) {
 			switch (baseFeatureID) {
-			case CoreModelPackage.YBLUR_NOTIFIER__LAST_BLUR_EVENT:
-				return ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT;
-			default:
-				return -1;
+				case CoreModelPackage.YBLUR_NOTIFIER__LAST_BLUR_EVENT: return ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_BLUR_EVENT;
+				default: return -1;
 			}
 		}
 		if (baseClass == YSelectionBindable.class) {
 			switch (baseFeatureID) {
-			case CoreModelPackage.YSELECTION_BINDABLE__SELECTION_BINDING_ENDPOINT:
-				return ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT;
-			default:
-				return -1;
+				case CoreModelPackage.YSELECTION_BINDABLE__SELECTION_BINDING_ENDPOINT: return ExtensionModelPackage.YSUGGEST_TEXT_FIELD__SELECTION_BINDING_ENDPOINT;
+				default: return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -1553,8 +1404,7 @@
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");