[482528] Update the properties to use the latest EEF API

1) Unused concepts have been removed (expressions, checkbox, selectbox)
2) The EEF API has been modified to the bridge has been improved to use
this new API

Change-Id: I2282366ad930e1900e968e2a40e11eb8a985a5a4
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>

108 files changed, 1695 insertions, 11750 deletions

diff --git a/incubation/org.eclipse.sirius.expression.edit/.checkstyle b/incubation/org.eclipse.sirius.expression.edit/.checkstyle
deleted file mode 100644
index f1a81eec72..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/.checkstyle
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EEF" location="/org.eclipse.eef.releng/codestyle/EEFCheckstyleConfiguration.xml" type="project" description="">
-    <additional-data name="protect-config-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="EEF" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-  <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src-gen"/>
-  </filter>
-</fileset-config>
diff --git a/incubation/org.eclipse.sirius.expression.edit/.classpath b/incubation/org.eclipse.sirius.expression.edit/.classpath
deleted file mode 100644
index e4dad7e73e..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/incubation/org.eclipse.sirius.expression.edit/.project b/incubation/org.eclipse.sirius.expression.edit/.project
deleted file mode 100644
index 4a7c2dc154..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.sirius.expression.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-	</natures>
-</projectDescription>
diff --git a/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.core.prefs b/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6594cd26ea..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,398 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.launching.prefs b/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.ui.prefs b/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index e6ceed5c24..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,67 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=com;java;javax;org;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * Return the ${bare_field_name}.\n *\n * @return the ${bare_field_name}\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * Sets the ${bare_field_name}.\n *\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) 2015 Obeo.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *    Obeo - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * {@inheritDoc}\n *\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">EEFIdePlugin.getImplementation().logError(message, e);</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="false" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return this.${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=false
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=false
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=false
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=false
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=false
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=false
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=false
-sp_cleanup.remove_unused_private_types=false
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false
-sp_cleanup.use_type_arguments=false
diff --git a/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.pde.prefs b/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 3112e810db..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,32 +0,0 @@
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.build.bin.includes=1
-compilers.p.build.encodings=1
-compilers.p.build.java.compiler=1
-compilers.p.build.java.compliance=1
-compilers.p.build.missing.output=2
-compilers.p.build.output.library=1
-compilers.p.build.source.library=1
-compilers.p.build.src.includes=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=1
-compilers.p.missing-version-export-package=0
-compilers.p.missing-version-import-package=0
-compilers.p.missing-version-require-bundle=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/incubation/org.eclipse.sirius.expression.edit/META-INF/MANIFEST.MF b/incubation/org.eclipse.sirius.expression.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 2069c4a4ea..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.sirius.expression.edit;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.sirius.expression.provider.ExpressionEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.sirius.expression.provider;version="1.0.0"
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.sirius.expression;bundle-version="1.0.0";visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/incubation/org.eclipse.sirius.expression.edit/about.html b/incubation/org.eclipse.sirius.expression.edit/about.html
deleted file mode 100644
index f3a55ce5fd..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 15, 2010</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/incubation/org.eclipse.sirius.expression.edit/build.properties b/incubation/org.eclipse.sirius.expression.edit/build.properties
deleted file mode 100644
index 0b892ee532..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2015 Obeo.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.htm
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src-gen/
-output.. = bin/
-javacProjectSettings = true
diff --git a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/ExpressionDescription.gif b/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/ExpressionDescription.gif
deleted file mode 100644
index a3908bcf7b..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/ExpressionDescription.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionClass.gif b/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionClass.gif
deleted file mode 100644
index 98b351f1c4..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionClass.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionDescription.gif b/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionDescription.gif
deleted file mode 100644
index 134551bff7..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionDescription.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionPackage.gif b/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionPackage.gif
deleted file mode 100644
index ea58a657dc..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusExpressionPackage.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusParameter.gif b/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusParameter.gif
deleted file mode 100644
index 134551bff7..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusParameter.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusVariable.gif b/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusVariable.gif
deleted file mode 100644
index 5915591825..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/SiriusVariable.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/UserDefinedVariable.gif b/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/UserDefinedVariable.gif
deleted file mode 100644
index 8a5c70cbd7..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/UserDefinedVariable.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/Variable.gif b/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/Variable.gif
deleted file mode 100644
index 83afb9b3c9..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/icons/full/obj16/Variable.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.expression.edit/plugin.properties b/incubation/org.eclipse.sirius.expression.edit/plugin.properties
deleted file mode 100644
index 976114c13f..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/plugin.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) 2015 Obeo.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.htm
-
-pluginName = Sirius Expression Edit Support
-providerName = Eclipse Modeling Project
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_SiriusExpressionPackage_type = Sirius Expression Package
-_UI_ExpressionDescription_type = Description
-_UI_Variable_type = Variable
-_UI_SiriusExpressionClass_type = Sirius Expression Class
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_SiriusExpressionPackage_expressionClasses_feature = Expression Classes
-_UI_SiriusExpressionPackage_ePackage_feature = EPackage
-_UI_ExpressionDescription_lowerBound_feature = Lower Bound
-_UI_ExpressionDescription_upperBound_feature = Upper Bound
-_UI_ExpressionDescription_expression_feature = Expression
-_UI_ExpressionDescription_variables_feature = Variables
-_UI_ExpressionDescription_returnType_feature = Return Type
-_UI_ExpressionDescription_label_feature = Label
-_UI_ExpressionDescription_contextableElements_feature = Contextable Elements
-_UI_Variable_name_feature = Name
-_UI_Variable_documentation_feature = Documentation
-_UI_SiriusExpressionClass_variables_feature = Variables
-_UI_SiriusExpressionClass_expressionDescriptions_feature = Expression Descriptions
-_UI_SiriusExpressionClass_label_feature = Label
-_UI_Unknown_feature = Unspecified
-
-_UI_SiriusVariable_type = Sirius Variable
-_UI_SiriusVariable_name_feature = Name
-_UI_SiriusVariable_documentation_feature = Documentation
-_UI_SiriusExpressionDescription_type = Sirius Expression Description
-_UI_SiriusParameter_type = Sirius Parameter
-_UI_SiriusExpressionDescription_lowerBound_feature = Lower Bound
-_UI_SiriusExpressionDescription_upperBound_feature = Upper Bound
-_UI_SiriusExpressionDescription_expression_feature = Expression
-_UI_SiriusExpressionDescription_parameters_feature = Parameters
-_UI_SiriusExpressionDescription_returnType_feature = Return Type
-_UI_SiriusExpressionDescription_variableContainers_feature = Variable Containers
-_UI_SiriusVariable_eType_feature = EType
-_UI_SiriusExpressionClass_eClass_feature = EClass
-_UI_SiriusParameter_optional_feature = Optional
-_UI_SiriusParameter_variable_feature = Variable
-_UI_UserDefinedVariable_type = User Defined Variable
-_UI_UserDefinedVariable_valueExpression_feature = Value Expression
diff --git a/incubation/org.eclipse.sirius.expression.edit/plugin.xml b/incubation/org.eclipse.sirius.expression.edit/plugin.xml
deleted file mode 100644
index 3098b8618b..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2015 Obeo.
- All rights reserved. This program and the accompanying materials 
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.htm
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated expression -->
-      <factory
-            uri="http://www.eclipse.org/sirius/expression"
-            class="org.eclipse.sirius.expression.provider.ExpressionItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-</plugin>
diff --git a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/ExpressionEditPlugin.java b/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/ExpressionEditPlugin.java
deleted file mode 100644
index efaf7d8266..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/ExpressionEditPlugin.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-/**
- * This is the central singleton for the Expression edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public final class ExpressionEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static final ExpressionEditPlugin INSTANCE = new ExpressionEditPlugin();
-
-	/**
-	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ExpressionEditPlugin() {
-		super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, });
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/ExpressionItemProviderAdapterFactory.java b/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/ExpressionItemProviderAdapterFactory.java
deleted file mode 100644
index a0cf58011b..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/ExpressionItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.sirius.expression.util.ExpressionAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The adapters generated by this
- * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ExpressionItemProviderAdapterFactory extends ExpressionAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ExpressionItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.sirius.expression.SiriusExpressionPackage}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected SiriusExpressionPackageItemProvider siriusExpressionPackageItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.sirius.expression.SiriusExpressionPackage}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createSiriusExpressionPackageAdapter() {
-		if (siriusExpressionPackageItemProvider == null) {
-			siriusExpressionPackageItemProvider = new SiriusExpressionPackageItemProvider(this);
-		}
-
-		return siriusExpressionPackageItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.sirius.expression.SiriusExpressionDescription} instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected SiriusExpressionDescriptionItemProvider siriusExpressionDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.sirius.expression.SiriusExpressionDescription}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createSiriusExpressionDescriptionAdapter() {
-		if (siriusExpressionDescriptionItemProvider == null) {
-			siriusExpressionDescriptionItemProvider = new SiriusExpressionDescriptionItemProvider(this);
-		}
-
-		return siriusExpressionDescriptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.sirius.expression.SiriusVariable} instances.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected SiriusVariableItemProvider siriusVariableItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.sirius.expression.SiriusVariable}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createSiriusVariableAdapter() {
-		if (siriusVariableItemProvider == null) {
-			siriusVariableItemProvider = new SiriusVariableItemProvider(this);
-		}
-
-		return siriusVariableItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.sirius.expression.SiriusExpressionClass}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected SiriusExpressionClassItemProvider siriusExpressionClassItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.sirius.expression.SiriusExpressionClass}. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createSiriusExpressionClassAdapter() {
-		if (siriusExpressionClassItemProvider == null) {
-			siriusExpressionClassItemProvider = new SiriusExpressionClassItemProvider(this);
-		}
-
-		return siriusExpressionClassItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.sirius.expression.SiriusParameter} instances.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected SiriusParameterItemProvider siriusParameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.sirius.expression.SiriusParameter}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createSiriusParameterAdapter() {
-		if (siriusParameterItemProvider == null) {
-			siriusParameterItemProvider = new SiriusParameterItemProvider(this);
-		}
-
-		return siriusParameterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.sirius.expression.UserDefinedVariable}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected UserDefinedVariableItemProvider userDefinedVariableItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.sirius.expression.UserDefinedVariable}. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createUserDefinedVariableAdapter() {
-		if (userDefinedVariableItemProvider == null) {
-			userDefinedVariableItemProvider = new UserDefinedVariableItemProvider(this);
-		}
-
-		return userDefinedVariableItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		if (siriusExpressionPackageItemProvider != null)
-			siriusExpressionPackageItemProvider.dispose();
-		if (siriusExpressionDescriptionItemProvider != null)
-			siriusExpressionDescriptionItemProvider.dispose();
-		if (siriusVariableItemProvider != null)
-			siriusVariableItemProvider.dispose();
-		if (siriusExpressionClassItemProvider != null)
-			siriusExpressionClassItemProvider.dispose();
-		if (siriusParameterItemProvider != null)
-			siriusParameterItemProvider.dispose();
-		if (userDefinedVariableItemProvider != null)
-			userDefinedVariableItemProvider.dispose();
-	}
-
-}
diff --git a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionClassItemProvider.java b/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionClassItemProvider.java
deleted file mode 100644
index 161c9de6fe..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionClassItemProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.expression.ExpressionFactory;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionClass;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.sirius.expression.SiriusExpressionClass} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SiriusExpressionClassItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public SiriusExpressionClassItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addEClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the EClass feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addEClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(), getString("_UI_SiriusExpressionClass_eClass_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_SiriusExpressionClass_eClass_feature", "_UI_SiriusExpressionClass_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExpressionPackage.Literals.SIRIUS_EXPRESSION_CLASS__ECLASS, true, false, true, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ExpressionPackage.Literals.SIRIUS_EXPRESSION_CLASS__VARIABLES);
-			childrenFeatures.add(ExpressionPackage.Literals.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns SiriusExpressionClass.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SiriusExpressionClass")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_SiriusExpressionClass_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SiriusExpressionClass.class)) {
-		case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__VARIABLES:
-		case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(ExpressionPackage.Literals.SIRIUS_EXPRESSION_CLASS__VARIABLES,
-				ExpressionFactory.eINSTANCE.createSiriusVariable()));
-
-		newChildDescriptors.add(createChildParameter(ExpressionPackage.Literals.SIRIUS_EXPRESSION_CLASS__VARIABLES,
-				ExpressionFactory.eINSTANCE.createUserDefinedVariable()));
-
-		newChildDescriptors.add(createChildParameter(ExpressionPackage.Literals.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS,
-				ExpressionFactory.eINSTANCE.createSiriusExpressionDescription()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ExpressionEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionDescriptionItemProvider.java b/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionDescriptionItemProvider.java
deleted file mode 100644
index 121ca5df4d..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionDescriptionItemProvider.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.expression.ExpressionFactory;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionDescription;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.sirius.expression.SiriusExpressionDescription} object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SiriusExpressionDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public SiriusExpressionDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLowerBoundPropertyDescriptor(object);
-			addUpperBoundPropertyDescriptor(object);
-			addExpressionPropertyDescriptor(object);
-			addReturnTypePropertyDescriptor(object);
-			addVariableContainersPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Lower Bound feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addLowerBoundPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_SiriusExpressionDescription_lowerBound_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_SiriusExpressionDescription_lowerBound_feature", "_UI_SiriusExpressionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						ExpressionPackage.Literals.SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND, true, false, false,
-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Upper Bound feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addUpperBoundPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_SiriusExpressionDescription_upperBound_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_SiriusExpressionDescription_upperBound_feature", "_UI_SiriusExpressionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						ExpressionPackage.Literals.SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND, true, false, false,
-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Expression feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_SiriusExpressionDescription_expression_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_SiriusExpressionDescription_expression_feature", "_UI_SiriusExpressionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						ExpressionPackage.Literals.SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION, true, false, true, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Return Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addReturnTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_SiriusExpressionDescription_returnType_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_SiriusExpressionDescription_returnType_feature", "_UI_SiriusExpressionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						ExpressionPackage.Literals.SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE, true, false, true, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Variable Containers feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	protected void addVariableContainersPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_SiriusExpressionDescription_variableContainers_feature"), //$NON-NLS-1$
-						getString(
-								"_UI_PropertyDescriptor_description", "_UI_SiriusExpressionDescription_variableContainers_feature", "_UI_SiriusExpressionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						ExpressionPackage.Literals.SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS, true, false, true, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ExpressionPackage.Literals.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns SiriusExpressionDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SiriusExpressionDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		SiriusExpressionDescription siriusExpressionDescription = (SiriusExpressionDescription) object;
-		return getString("_UI_SiriusExpressionDescription_type") + " " + siriusExpressionDescription.getLowerBound(); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SiriusExpressionDescription.class)) {
-		case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND:
-		case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(ExpressionPackage.Literals.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS,
-				ExpressionFactory.eINSTANCE.createSiriusParameter()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ExpressionEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionPackageItemProvider.java b/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionPackageItemProvider.java
deleted file mode 100644
index 8ca6eee715..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusExpressionPackageItemProvider.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.expression.ExpressionFactory;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.sirius.expression.SiriusExpressionPackage} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SiriusExpressionPackageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public SiriusExpressionPackageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addEPackagePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the EPackage feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addEPackagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(), getString("_UI_SiriusExpressionPackage_ePackage_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_SiriusExpressionPackage_ePackage_feature", "_UI_SiriusExpressionPackage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExpressionPackage.Literals.SIRIUS_EXPRESSION_PACKAGE__EPACKAGE, true, false, true, null, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ExpressionPackage.Literals.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns SiriusExpressionPackage.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SiriusExpressionPackage")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_SiriusExpressionPackage_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SiriusExpressionPackage.class)) {
-		case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(ExpressionPackage.Literals.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES,
-				ExpressionFactory.eINSTANCE.createSiriusExpressionClass()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ExpressionEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusParameterItemProvider.java b/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusParameterItemProvider.java
deleted file mode 100644
index 74dff14ad7..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusParameterItemProvider.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusParameter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.sirius.expression.SiriusParameter} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SiriusParameterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public SiriusParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addOptionalPropertyDescriptor(object);
-			addVariablePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Optional feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addOptionalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(), getString("_UI_SiriusParameter_optional_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_SiriusParameter_optional_feature", "_UI_SiriusParameter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExpressionPackage.Literals.SIRIUS_PARAMETER__OPTIONAL, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Variable feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addVariablePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(), getString("_UI_SiriusParameter_variable_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_SiriusParameter_variable_feature", "_UI_SiriusParameter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExpressionPackage.Literals.SIRIUS_PARAMETER__VARIABLE, true, false, true, null, null, null));
-	}
-
-	/**
-	 * This returns SiriusParameter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SiriusParameter")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		SiriusParameter siriusParameter = (SiriusParameter) object;
-		return getString("_UI_SiriusParameter_type") + " " + siriusParameter.isOptional(); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SiriusParameter.class)) {
-		case ExpressionPackage.SIRIUS_PARAMETER__OPTIONAL:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ExpressionEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusVariableItemProvider.java b/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusVariableItemProvider.java
deleted file mode 100644
index e79e8f518e..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/SiriusVariableItemProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusVariable;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.sirius.expression.SiriusVariable} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SiriusVariableItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public SiriusVariableItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addDocumentationPropertyDescriptor(object);
-			addETypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(), getString("_UI_SiriusVariable_name_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_SiriusVariable_name_feature", "_UI_SiriusVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExpressionPackage.Literals.SIRIUS_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Documentation feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDocumentationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_SiriusVariable_documentation_feature"), //$NON-NLS-1$
-						getString("_UI_PropertyDescriptor_description", "_UI_SiriusVariable_documentation_feature", "_UI_SiriusVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						ExpressionPackage.Literals.SIRIUS_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the EType feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addETypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(), getString("_UI_SiriusVariable_eType_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_SiriusVariable_eType_feature", "_UI_SiriusVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExpressionPackage.Literals.SIRIUS_VARIABLE__ETYPE, true, false, true, null, null, null));
-	}
-
-	/**
-	 * This returns SiriusVariable.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SiriusVariable")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((SiriusVariable) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_SiriusVariable_type") : //$NON-NLS-1$
-				getString("_UI_SiriusVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SiriusVariable.class)) {
-		case ExpressionPackage.SIRIUS_VARIABLE__NAME:
-		case ExpressionPackage.SIRIUS_VARIABLE__DOCUMENTATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ExpressionEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/UserDefinedVariableItemProvider.java b/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/UserDefinedVariableItemProvider.java
deleted file mode 100644
index f6b1886fbc..0000000000
--- a/incubation/org.eclipse.sirius.expression.edit/src-gen/org/eclipse/sirius/expression/provider/UserDefinedVariableItemProvider.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.UserDefinedVariable;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.sirius.expression.UserDefinedVariable} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class UserDefinedVariableItemProvider extends SiriusVariableItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public UserDefinedVariableItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValueExpressionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value Expression feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addValueExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_UserDefinedVariable_valueExpression_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_UserDefinedVariable_valueExpression_feature", "_UI_UserDefinedVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExpressionPackage.Literals.USER_DEFINED_VARIABLE__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				null, null));
-	}
-
-	/**
-	 * This returns UserDefinedVariable.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/UserDefinedVariable")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((UserDefinedVariable) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_UserDefinedVariable_type") : //$NON-NLS-1$
-				getString("_UI_UserDefinedVariable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(UserDefinedVariable.class)) {
-		case ExpressionPackage.USER_DEFINED_VARIABLE__VALUE_EXPRESSION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/incubation/org.eclipse.sirius.expression/.checkstyle b/incubation/org.eclipse.sirius.expression/.checkstyle
deleted file mode 100644
index f1a81eec72..0000000000
--- a/incubation/org.eclipse.sirius.expression/.checkstyle
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EEF" location="/org.eclipse.eef.releng/codestyle/EEFCheckstyleConfiguration.xml" type="project" description="">
-    <additional-data name="protect-config-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="EEF" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-  <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src-gen"/>
-  </filter>
-</fileset-config>
diff --git a/incubation/org.eclipse.sirius.expression/.classpath b/incubation/org.eclipse.sirius.expression/.classpath
deleted file mode 100644
index e4dad7e73e..0000000000
--- a/incubation/org.eclipse.sirius.expression/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/incubation/org.eclipse.sirius.expression/.project b/incubation/org.eclipse.sirius.expression/.project
deleted file mode 100644
index bace3fa3e8..0000000000
--- a/incubation/org.eclipse.sirius.expression/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.sirius.expression</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.sirius.nature.modelingproject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-	</natures>
-</projectDescription>
diff --git a/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.core.prefs b/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6594cd26ea..0000000000
--- a/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,398 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.launching.prefs b/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb235278e..0000000000
--- a/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.ui.prefs b/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index e6ceed5c24..0000000000
--- a/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,67 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=com;java;javax;org;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * Return the ${bare_field_name}.\n *\n * @return the ${bare_field_name}\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * Sets the ${bare_field_name}.\n *\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) 2015 Obeo.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *    Obeo - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * {@inheritDoc}\n *\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">EEFIdePlugin.getImplementation().logError(message, e);</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="false" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return this.${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=false
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=false
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=false
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=false
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=false
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=false
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=false
-sp_cleanup.remove_unused_private_types=false
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false
-sp_cleanup.use_type_arguments=false
diff --git a/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.pde.prefs b/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 3112e810db..0000000000
--- a/incubation/org.eclipse.sirius.expression/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,32 +0,0 @@
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.build.bin.includes=1
-compilers.p.build.encodings=1
-compilers.p.build.java.compiler=1
-compilers.p.build.java.compliance=1
-compilers.p.build.missing.output=2
-compilers.p.build.output.library=1
-compilers.p.build.source.library=1
-compilers.p.build.src.includes=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=1
-compilers.p.missing-version-export-package=0
-compilers.p.missing-version-import-package=0
-compilers.p.missing-version-require-bundle=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/incubation/org.eclipse.sirius.expression/META-INF/MANIFEST.MF b/incubation/org.eclipse.sirius.expression/META-INF/MANIFEST.MF
deleted file mode 100644
index 5b945abfac..0000000000
--- a/incubation/org.eclipse.sirius.expression/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.sirius.expression;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.sirius.expression;version="1.0.0";
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util",
- org.eclipse.sirius.expression.impl;version="1.0.0";
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.util,
-   org.eclipse.sirius.expression,
-   org.eclipse.emf.common.notify",
- org.eclipse.sirius.expression.util;version="1.0.0";
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.notify,
-   org.eclipse.sirius.expression,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.ecore.util"
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,3.0.0)"
-Bundle-ActivationPolicy: lazy
diff --git a/incubation/org.eclipse.sirius.expression/about.html b/incubation/org.eclipse.sirius.expression/about.html
deleted file mode 100644
index f3a55ce5fd..0000000000
--- a/incubation/org.eclipse.sirius.expression/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 15, 2010</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/incubation/org.eclipse.sirius.expression/build.properties b/incubation/org.eclipse.sirius.expression/build.properties
deleted file mode 100644
index 7dafef1b51..0000000000
--- a/incubation/org.eclipse.sirius.expression/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2015 Obeo.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.htm
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src-gen/
-output.. = bin/
-javacProjectSettings = true
diff --git a/incubation/org.eclipse.sirius.expression/model/expression.aird b/incubation/org.eclipse.sirius.expression/model/expression.aird
deleted file mode 100644
index 0320df9073..0000000000
--- a/incubation/org.eclipse.sirius.expression/model/expression.aird
+++ /dev/null
@@ -1,928 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:table="http://www.eclipse.org/sirius/table/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/table/description/1.1.0 http://www.eclipse.org/sirius/table/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style" xmi:id="_2yiG0GK_EeWUJMsiTzrF8g" selectedViews="_20o_oGK_EeWUJMsiTzrF8g _TIk4cGgoEeWzY_kIitvDmg" version="10.0.0.201505222000">
-  <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
-  <semanticResources>expression.ecore</semanticResources>
-  <semanticResources>platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore</semanticResources>
-  <semanticResources>interpretedexpression.ecore</semanticResources>
-  <semanticResources>expression.genmodel</semanticResources>
-  <semanticResources>EEFExpression.xmi</semanticResources>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_20o_oGK_EeWUJMsiTzrF8g">
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_6HBoQGOBEeWL_YVya3JVNw" name="expression class diagram">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_6HBoQWOBEeWL_YVya3JVNw" source="DANNOTATION_CUSTOMIZATION_KEY">
-        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_6HBoQmOBEeWL_YVya3JVNw">
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_7ydPUGOBEeWL_YVya3JVNw" sourceArrow="FillDiamond" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_7ydPUWOBEeWL_YVya3JVNw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_7ydPUmOBEeWL_YVya3JVNw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-          <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_PFZCJGOOEeWL_YVya3JVNw" routingStyle="manhattan">
-            <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_PFZCJWOOEeWL_YVya3JVNw" showIcon="false" labelExpression="service:render">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </centerLabelStyleDescription>
-            <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_PFZCJmOOEeWL_YVya3JVNw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-              <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            </endLabelStyleDescription>
-          </computedStyleDescriptions>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_6HFSoGOBEeWL_YVya3JVNw" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_6HFSoWOBEeWL_YVya3JVNw" type="Sirius" element="_6HBoQGOBEeWL_YVya3JVNw" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_7yiH0GOBEeWL_YVya3JVNw" type="2003" element="_7yVTgGOBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_7yiH02OBEeWL_YVya3JVNw" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_7yiu4GOBEeWL_YVya3JVNw" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_7ykkEGOBEeWL_YVya3JVNw" type="3010" element="_7yYW0GOBEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_7ykkEWOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_7ykkEmOBEeWL_YVya3JVNw"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_7yiu4WOBEeWL_YVya3JVNw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_7yiu4mOBEeWL_YVya3JVNw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_7yiH0WOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yiH0mOBEeWL_YVya3JVNw" x="210" y="320"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_7yjV8GOBEeWL_YVya3JVNw" type="2003" element="_7yV6kGOBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_7yjV82OBEeWL_YVya3JVNw" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_7yjV9GOBEeWL_YVya3JVNw" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_7ylLIGOBEeWL_YVya3JVNw" type="3010" element="_7yY94WOBEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_7ylLIWOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_7ylLImOBEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_7ylLI2OBEeWL_YVya3JVNw" type="3010" element="_7yZk8WOBEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_7ylLJGOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_7ylLJWOBEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_7ylLJmOBEeWL_YVya3JVNw" type="3010" element="_7yaMAGOBEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_7ylLJ2OBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_7ylLKGOBEeWL_YVya3JVNw"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_7yjV9WOBEeWL_YVya3JVNw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_7yjV9mOBEeWL_YVya3JVNw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_7yjV8WOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yjV8mOBEeWL_YVya3JVNw" y="160"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_7yj9AGOBEeWL_YVya3JVNw" type="2003" element="_7yWhoWOBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_7yj9A2OBEeWL_YVya3JVNw" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_7yj9BGOBEeWL_YVya3JVNw" type="7004">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_7yj9BWOBEeWL_YVya3JVNw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_7yj9BmOBEeWL_YVya3JVNw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_7yj9AWOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yj9AmOBEeWL_YVya3JVNw" x="210" y="480"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_7yj9B2OBEeWL_YVya3JVNw" type="2003" element="_7yXIsGOBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_7yj9CmOBEeWL_YVya3JVNw" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_7yj9C2OBEeWL_YVya3JVNw" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_7ylLKWOBEeWL_YVya3JVNw" type="3010" element="_7yaMAmOBEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_7ylLKmOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_7ylLK2OBEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_7ylyMGOBEeWL_YVya3JVNw" type="3010" element="_7yazEWOBEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_7ylyMWOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_7ylyMmOBEeWL_YVya3JVNw"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_7yj9DGOBEeWL_YVya3JVNw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_7yj9DWOBEeWL_YVya3JVNw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_7yj9CGOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yj9CWOBEeWL_YVya3JVNw" x="192"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_9BAtIGOBEeWL_YVya3JVNw" type="2003" element="_9A1uAGOBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_9BBUMGOBEeWL_YVya3JVNw" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_9BBUMWOBEeWL_YVya3JVNw" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_9BBUNGOBEeWL_YVya3JVNw" type="3010" element="_9A-Q4GOBEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_9BBUNWOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8" italic="true"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_9BBUNmOBEeWL_YVya3JVNw"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_9BBUMmOBEeWL_YVya3JVNw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_9BBUM2OBEeWL_YVya3JVNw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_9BAtIWOBEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9BAtImOBEeWL_YVya3JVNw" x="35" y="417" width="140" height="50"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Du8kwGOCEeWL_YVya3JVNw" type="2003" element="_Duza0GOCEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_Du8kw2OCEeWL_YVya3JVNw" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_Du8kxGOCEeWL_YVya3JVNw" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_Du9L0GOCEeWL_YVya3JVNw" type="3010" element="_Du6IgGOCEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_Du9L0WOCEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8" italic="true"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Du9L0mOCEeWL_YVya3JVNw"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_Du8kxWOCEeWL_YVya3JVNw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_Du8kxmOCEeWL_YVya3JVNw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_Du8kwWOCEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Du8kwmOCEeWL_YVya3JVNw" x="35" y="480" width="140" height="50"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Xhd3kGODEeWL_YVya3JVNw" type="2003" element="_XhP1IGODEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_XheeoGODEeWL_YVya3JVNw" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_XheeoWODEeWL_YVya3JVNw" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_XheepGODEeWL_YVya3JVNw" type="3010" element="_XhaNMGODEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_XheepWODEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8" italic="true"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XheepmODEeWL_YVya3JVNw"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_XheeomODEeWL_YVya3JVNw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_Xheeo2ODEeWL_YVya3JVNw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_Xhd3kWODEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xhd3kmODEeWL_YVya3JVNw" x="35" y="565" width="140" height="73"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_PFbeYGOOEeWL_YVya3JVNw" type="2003" element="_PFFgIGOOEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_PFbeY2OOEeWL_YVya3JVNw" type="5007"/>
-            <children xmi:type="notation:Node" xmi:id="_PFbeZGOOEeWL_YVya3JVNw" type="7004">
-              <children xmi:type="notation:Node" xmi:id="_PFcFcGOOEeWL_YVya3JVNw" type="3010" element="_PFRtYGOOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcFcWOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcFcmOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcFc2OOEeWL_YVya3JVNw" type="3010" element="_PFSUcGOOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcFdGOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcFdWOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcFdmOOEeWL_YVya3JVNw" type="3010" element="_PFSUcmOOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcFd2OOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcFeGOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcFeWOOEeWL_YVya3JVNw" type="3010" element="_PFV-0WOOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcFemOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcFe2OOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcFfGOOEeWL_YVya3JVNw" type="3010" element="_PFWl4WOOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcFfWOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcFfmOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcFf2OOEeWL_YVya3JVNw" type="3010" element="_PFWl42OOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcFgGOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcFgWOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcFgmOOEeWL_YVya3JVNw" type="3010" element="_PFWl5WOOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcFg2OOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcFhGOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcFhWOOEeWL_YVya3JVNw" type="3010" element="_PFWl52OOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcFhmOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcFh2OOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcsgGOOEeWL_YVya3JVNw" type="3010" element="_PFWl6WOOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcsgWOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcsgmOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcsg2OOEeWL_YVya3JVNw" type="3010" element="_PFWl62OOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcshGOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcshWOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFcshmOOEeWL_YVya3JVNw" type="3010" element="_PFXM8WOOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFcsh2OOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFcsiGOOEeWL_YVya3JVNw"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PFdTkGOOEeWL_YVya3JVNw" type="3010" element="_PFXM82OOEeWL_YVya3JVNw">
-                <styles xmi:type="notation:FontStyle" xmi:id="_PFdTkWOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PFdTkmOOEeWL_YVya3JVNw"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_PFbeZWOOEeWL_YVya3JVNw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_PFbeZmOOEeWL_YVya3JVNw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_PFbeYWOOEeWL_YVya3JVNw" fontName="Droid Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFbeYmOOEeWL_YVya3JVNw" x="420" y="98"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_6HFSomOBEeWL_YVya3JVNw"/>
-          <edges xmi:type="notation:Edge" xmi:id="_7ymZQGOBEeWL_YVya3JVNw" type="4001" element="_7ycoQGOBEeWL_YVya3JVNw" source="_7yiH0GOBEeWL_YVya3JVNw" target="_7yj9B2OBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_7ymZRGOBEeWL_YVya3JVNw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ymZRWOBEeWL_YVya3JVNw" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_7ymZRmOBEeWL_YVya3JVNw" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ymZR2OBEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_7ymZSGOBEeWL_YVya3JVNw" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ymZSWOBEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_7ymZQWOBEeWL_YVya3JVNw" routing="Rectilinear"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_7ymZQmOBEeWL_YVya3JVNw" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ymZQ2OBEeWL_YVya3JVNw" points="[0, 0, 0, 220]$[0, -220, 0, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ynAUGOBEeWL_YVya3JVNw" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ynAUWOBEeWL_YVya3JVNw" id="(0.4966442953020134,1.0)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_7ynAUmOBEeWL_YVya3JVNw" type="4001" element="_7yd2YGOBEeWL_YVya3JVNw" source="_7yiH0GOBEeWL_YVya3JVNw" target="_7yjV8GOBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_7ynnYGOBEeWL_YVya3JVNw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ynnYWOBEeWL_YVya3JVNw" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_7ynnYmOBEeWL_YVya3JVNw" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ynnY2OBEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_7ynnZGOBEeWL_YVya3JVNw" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ynnZWOBEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_7ynAU2OBEeWL_YVya3JVNw" routing="Rectilinear"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_7ynAVGOBEeWL_YVya3JVNw" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ynAVWOBEeWL_YVya3JVNw" points="[0, 0, 194, 60]$[-194, -60, 0, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ynnZmOBEeWL_YVya3JVNw" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ynnZ2OBEeWL_YVya3JVNw" id="(0.5,1.0)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_7ynnaGOBEeWL_YVya3JVNw" type="4001" element="_7yfEgGOBEeWL_YVya3JVNw" source="_7yjV8GOBEeWL_YVya3JVNw" target="_7yj9B2OBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_7ynnbGOBEeWL_YVya3JVNw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ynnbWOBEeWL_YVya3JVNw" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_7ynnbmOBEeWL_YVya3JVNw" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ynnb2OBEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_7ynncGOBEeWL_YVya3JVNw" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ynncWOBEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_7ynnaWOBEeWL_YVya3JVNw" routing="Rectilinear"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_7ynnamOBEeWL_YVya3JVNw" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ynna2OBEeWL_YVya3JVNw" points="[0, 0, -194, 60]$[194, -60, 0, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ynncmOBEeWL_YVya3JVNw" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ynnc2OBEeWL_YVya3JVNw" id="(0.4966442953020134,1.0)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_7yoOcGOBEeWL_YVya3JVNw" type="4001" element="_7yfrkGOBEeWL_YVya3JVNw" source="_7yj9AGOBEeWL_YVya3JVNw" target="_7yiH0GOBEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_7yoOdGOBEeWL_YVya3JVNw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yoOdWOBEeWL_YVya3JVNw" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_7yoOdmOBEeWL_YVya3JVNw" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yoOd2OBEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_7yoOeGOBEeWL_YVya3JVNw" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yoOeWOBEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_7yoOcWOBEeWL_YVya3JVNw" routing="Rectilinear"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_7yoOcmOBEeWL_YVya3JVNw" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7yoOc2OBEeWL_YVya3JVNw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7yoOemOBEeWL_YVya3JVNw" id="(0.5,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7yoOe2OBEeWL_YVya3JVNw" id="(0.5,1.0)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_PFdTk2OOEeWL_YVya3JVNw" type="4001" element="_PFYbEGOOEeWL_YVya3JVNw" source="_PFbeYGOOEeWL_YVya3JVNw" target="_PFbeYGOOEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_PFdTl2OOEeWL_YVya3JVNw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFdTmGOOEeWL_YVya3JVNw" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_PFd6oGOOEeWL_YVya3JVNw" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFd6oWOOEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_PFd6omOOEeWL_YVya3JVNw" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFd6o2OOEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_PFdTlGOOEeWL_YVya3JVNw" routing="Rectilinear"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_PFdTlWOOEeWL_YVya3JVNw" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PFdTlmOOEeWL_YVya3JVNw" points="[480, 115, 480, 115]$[480, 115, 480, 115]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PFehsGOOEeWL_YVya3JVNw" id="(0.5,0.5)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PFehsWOOEeWL_YVya3JVNw" id="(0.5,0.5)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_PFehsmOOEeWL_YVya3JVNw" type="4001" element="_PFZCI2OOEeWL_YVya3JVNw" source="_PFbeYGOOEeWL_YVya3JVNw" target="_PFbeYGOOEeWL_YVya3JVNw">
-            <children xmi:type="notation:Node" xmi:id="_PFfIwGOOEeWL_YVya3JVNw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFfIwWOOEeWL_YVya3JVNw" y="-10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_PFfIwmOOEeWL_YVya3JVNw" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFfIw2OOEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_PFfIxGOOEeWL_YVya3JVNw" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFfIxWOOEeWL_YVya3JVNw" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_PFehs2OOEeWL_YVya3JVNw" routing="Rectilinear"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_PFehtGOOEeWL_YVya3JVNw" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PFehtWOOEeWL_YVya3JVNw" points="[480, 115, 480, 115]$[480, 115, 480, 115]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PFfIxmOOEeWL_YVya3JVNw" id="(0.5,0.5)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PFfIx2OOEeWL_YVya3JVNw" id="(0.5,0.5)"/>
-          </edges>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7yVTgGOBEeWL_YVya3JVNw" name="SiriusExpressionClass" tooltipText="" outgoingEdges="_7ycoQGOBEeWL_YVya3JVNw _7yd2YGOBEeWL_YVya3JVNw" incomingEdges="_7yfrkGOBEeWL_YVya3JVNw" width="12" height="10">
-        <target xmi:type="ecore:EClass" href="expression.ecore#//SiriusExpressionClass"/>
-        <semanticElements xmi:type="ecore:EClass" href="expression.ecore#//SiriusExpressionClass"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7yVTgWOBEeWL_YVya3JVNw" backgroundStyle="Liquid" foregroundColor="255,252,216">
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7yYW0GOBEeWL_YVya3JVNw" name="label : EString" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//SiriusExpressionClass/label"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//SiriusExpressionClass/label"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7yY94GOBEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7yV6kGOBEeWL_YVya3JVNw" name="ExpressionDescription" tooltipText="" outgoingEdges="_7yfEgGOBEeWL_YVya3JVNw" incomingEdges="_7yd2YGOBEeWL_YVya3JVNw" width="12" height="10">
-        <target xmi:type="ecore:EClass" href="expression.ecore#//ExpressionDescription"/>
-        <semanticElements xmi:type="ecore:EClass" href="expression.ecore#//ExpressionDescription"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_BLhyUGXeEeWL_YVya3JVNw" backgroundStyle="Liquid" foregroundColor="255,252,216">
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7yY94WOBEeWL_YVya3JVNw" name="lowerBound : EInt = " tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/lowerBound"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/lowerBound"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_8aNYYGXdEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7yZk8WOBEeWL_YVya3JVNw" name="upperBound : EInt = 1" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/upperBound"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/upperBound"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7yZk8mOBEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7yaMAGOBEeWL_YVya3JVNw" name="label : EString" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/label"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/label"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7yaMAWOBEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7yWhoWOBEeWL_YVya3JVNw" name="SiriusExpressionPackage" tooltipText="" outgoingEdges="_7yfrkGOBEeWL_YVya3JVNw" width="12" height="10">
-        <target xmi:type="ecore:EClass" href="expression.ecore#//SiriusExpressionPackage"/>
-        <semanticElements xmi:type="ecore:EClass" href="expression.ecore#//SiriusExpressionPackage"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7yWhomOBEeWL_YVya3JVNw" backgroundStyle="Liquid" foregroundColor="255,252,216">
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7yXIsGOBEeWL_YVya3JVNw" name="Variable" tooltipText="" incomingEdges="_7ycoQGOBEeWL_YVya3JVNw _7yfEgGOBEeWL_YVya3JVNw" width="12" height="10">
-        <target xmi:type="ecore:EClass" href="expression.ecore#//Variable"/>
-        <semanticElements xmi:type="ecore:EClass" href="expression.ecore#//Variable"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7yXIsWOBEeWL_YVya3JVNw" backgroundStyle="Liquid" foregroundColor="255,252,216">
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7yaMAmOBEeWL_YVya3JVNw" name="name : EString" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//Variable/name"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//Variable/name"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7yazEGOBEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7yazEWOBEeWL_YVya3JVNw" name="documentation : EString" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//Variable/documentation"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//Variable/documentation"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7ybaIGOBEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7ycoQGOBEeWL_YVya3JVNw" name="[0..*] variables" sourceNode="_7yVTgGOBEeWL_YVya3JVNw" targetNode="_7yXIsGOBEeWL_YVya3JVNw">
-        <target xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionClass/variables"/>
-        <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionClass/variables"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7ydPU2OBEeWL_YVya3JVNw" description="_7ydPUGOBEeWL_YVya3JVNw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7ydPVGOBEeWL_YVya3JVNw" showIcon="false">
-            <customFeatures>labelSize</customFeatures>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7ydPVWOBEeWL_YVya3JVNw" showIcon="false" labelColor="39,76,114">
-            <customFeatures>labelSize</customFeatures>
-          </endLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7yd2YGOBEeWL_YVya3JVNw" name="[0..*] expressionDescriptions" sourceNode="_7yVTgGOBEeWL_YVya3JVNw" targetNode="_7yV6kGOBEeWL_YVya3JVNw">
-        <target xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionClass/expressionDescriptions"/>
-        <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionClass/expressionDescriptions"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7yedcGOBEeWL_YVya3JVNw" description="_7ydPUGOBEeWL_YVya3JVNw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7yedcWOBEeWL_YVya3JVNw" showIcon="false">
-            <customFeatures>labelSize</customFeatures>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7yedcmOBEeWL_YVya3JVNw" showIcon="false" labelColor="39,76,114">
-            <customFeatures>labelSize</customFeatures>
-          </endLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7yfEgGOBEeWL_YVya3JVNw" name="[0..*] variables" sourceNode="_7yV6kGOBEeWL_YVya3JVNw" targetNode="_7yXIsGOBEeWL_YVya3JVNw">
-        <target xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/variables"/>
-        <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/variables"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7yfEgWOBEeWL_YVya3JVNw" routingStyle="manhattan" strokeColor="0,0,0">
-          <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7yfEgmOBEeWL_YVya3JVNw" showIcon="false">
-            <customFeatures>labelSize</customFeatures>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7yfEg2OBEeWL_YVya3JVNw" showIcon="false" labelColor="39,76,114">
-            <customFeatures>labelSize</customFeatures>
-          </endLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7yfrkGOBEeWL_YVya3JVNw" name="[0..*] expressionClasses" sourceNode="_7yWhoWOBEeWL_YVya3JVNw" targetNode="_7yVTgGOBEeWL_YVya3JVNw">
-        <target xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionPackage/expressionClasses"/>
-        <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionPackage/expressionClasses"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7yfrkWOBEeWL_YVya3JVNw" description="_7ydPUGOBEeWL_YVya3JVNw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7yfrkmOBEeWL_YVya3JVNw" showIcon="false">
-            <customFeatures>labelSize</customFeatures>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7yfrk2OBEeWL_YVya3JVNw" showIcon="false" labelColor="39,76,114">
-            <customFeatures>labelSize</customFeatures>
-          </endLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_9A1uAGOBEeWL_YVya3JVNw" name="Void" tooltipText="" width="14" height="5">
-        <target xmi:type="ecore:EDataType" href="expression.ecore#//Void"/>
-        <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Void"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_9A1uAWOBEeWL_YVya3JVNw" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="255,250,191">
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_9A-Q4GOBEeWL_YVya3JVNw" name="java.lang.Void" tooltipText="">
-          <target xmi:type="ecore:EDataType" href="expression.ecore#//Void"/>
-          <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Void"/>
-          <decorations xmi:type="viewpoint:Decoration" xmi:id="_9A-38WOBEeWL_YVya3JVNw">
-            <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
-          </decorations>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_9A-38GOBEeWL_YVya3JVNw" showIcon="false">
-            <labelFormat>italic</labelFormat>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@subNodeMappings[name='EC_DataType_InstanceClassName']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@subNodeMappings[name='EC_DataType_InstanceClassName']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_Duza0GOCEeWL_YVya3JVNw" name="Object" tooltipText="" width="14" height="5">
-        <target xmi:type="ecore:EDataType" href="expression.ecore#//Object"/>
-        <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Object"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Duza0WOCEeWL_YVya3JVNw" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="255,250,191">
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_Du6IgGOCEeWL_YVya3JVNw" name="java.lang.Object" tooltipText="">
-          <target xmi:type="ecore:EDataType" href="expression.ecore#//Object"/>
-          <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Object"/>
-          <decorations xmi:type="viewpoint:Decoration" xmi:id="_Du6vkGOCEeWL_YVya3JVNw">
-            <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
-          </decorations>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Du6IgWOCEeWL_YVya3JVNw" showIcon="false">
-            <labelFormat>italic</labelFormat>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@subNodeMappings[name='EC_DataType_InstanceClassName']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@subNodeMappings[name='EC_DataType_InstanceClassName']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_XhP1IGODEeWL_YVya3JVNw" name="Predicate" tooltipText="" width="14" height="5">
-        <target xmi:type="ecore:EDataType" href="expression.ecore#//Predicate"/>
-        <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Predicate"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XhQcMGODEeWL_YVya3JVNw" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="255,250,191">
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_XhaNMGODEeWL_YVya3JVNw" name="com.google.common.base" tooltipText="">
-          <target xmi:type="ecore:EDataType" href="expression.ecore#//Predicate"/>
-          <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Predicate"/>
-          <decorations xmi:type="viewpoint:Decoration" xmi:id="_XhbbUGODEeWL_YVya3JVNw">
-            <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
-          </decorations>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Xha0QGODEeWL_YVya3JVNw" showIcon="false">
-            <labelFormat>italic</labelFormat>
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@subNodeMappings[name='EC_DataType_InstanceClassName']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']/@subNodeMappings[name='EC_DataType_InstanceClassName']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_PFFgIGOOEeWL_YVya3JVNw" name="EClass" tooltipText="" outgoingEdges="_PFYbEGOOEeWL_YVya3JVNw _PFZCI2OOEeWL_YVya3JVNw" incomingEdges="_PFYbEGOOEeWL_YVya3JVNw _PFZCI2OOEeWL_YVya3JVNw" width="12" height="10">
-        <target xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
-        <semanticElements xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
-        <decorations xmi:type="viewpoint:Decoration" xmi:id="_PFX0AGOOEeWL_YVya3JVNw">
-          <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
-        </decorations>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_PFM04GOOEeWL_YVya3JVNw" backgroundStyle="Liquid" foregroundColor="255,252,216">
-          <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFRtYGOOEeWL_YVya3JVNw" name="Invalid feature as name" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/abstract"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/abstract"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFRtYWOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFSUcGOOEeWL_YVya3JVNw" name="Invalid feature as name" tooltipText="">
-          <target xmi:type="ecore:EAttribute" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/interface"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/interface"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFSUcWOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFSUcmOOEeWL_YVya3JVNw" name="isSuperTypeOf(someClass EClass) : EBoolean" tooltipText="isSuperTypeOf(someClass) : EBoolean">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/isSuperTypeOf"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/isSuperTypeOf"/>
-          <semanticElements xmi:type="ecore:EParameter" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/isSuperTypeOf/someClass"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFV-0GOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFV-0WOOEeWL_YVya3JVNw" name="getFeatureCount() : EInt" tooltipText="getFeatureCount() : EInt">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getFeatureCount"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getFeatureCount"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFWl4GOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFWl4WOOEeWL_YVya3JVNw" name="getEStructuralFeature(featureID EInt) : EStructuralFeature" tooltipText="getEStructuralFeature(featureID) : EStructuralFeature">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEStructuralFeature"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEStructuralFeature"/>
-          <semanticElements xmi:type="ecore:EParameter" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEStructuralFeature/featureID"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFWl4mOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFWl42OOEeWL_YVya3JVNw" name="getFeatureID(feature EStructuralFeature) : EInt" tooltipText="getFeatureID(feature) : EInt">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getFeatureID"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getFeatureID"/>
-          <semanticElements xmi:type="ecore:EParameter" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getFeatureID/feature"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFWl5GOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFWl5WOOEeWL_YVya3JVNw" name="getEStructuralFeature(featureName EString) : EStructuralFeature" tooltipText="getEStructuralFeature(featureName) : EStructuralFeature">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEStructuralFeature.1"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEStructuralFeature.1"/>
-          <semanticElements xmi:type="ecore:EParameter" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEStructuralFeature.1/featureName"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFWl5mOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFWl52OOEeWL_YVya3JVNw" name="getOperationCount() : EInt" tooltipText="getOperationCount() : EInt">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getOperationCount"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getOperationCount"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFWl6GOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFWl6WOOEeWL_YVya3JVNw" name="getEOperation(operationID EInt) : EOperation" tooltipText="getEOperation(operationID) : EOperation">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEOperation"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEOperation"/>
-          <semanticElements xmi:type="ecore:EParameter" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getEOperation/operationID"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFWl6mOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFWl62OOEeWL_YVya3JVNw" name="getOperationID(operation EOperation) : EInt" tooltipText="getOperationID(operation) : EInt">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getOperationID"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getOperationID"/>
-          <semanticElements xmi:type="ecore:EParameter" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getOperationID/operation"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFXM8GOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFXM8WOOEeWL_YVya3JVNw" name="getOverride(operation EOperation) : EOperation" tooltipText="getOverride(operation) : EOperation">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getOverride"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getOverride"/>
-          <semanticElements xmi:type="ecore:EParameter" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getOverride/operation"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFXM8mOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_PFXM82OOEeWL_YVya3JVNw" name="getFeatureType(feature EStructuralFeature) : EGenericType" tooltipText="getFeatureType(feature) : EGenericType">
-          <target xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getFeatureType"/>
-          <semanticElements xmi:type="ecore:EOperation" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getFeatureType"/>
-          <semanticElements xmi:type="ecore:EParameter" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/getFeatureType/feature"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_PFXM9GOOEeWL_YVya3JVNw" labelAlignment="LEFT">
-            <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-        </ownedElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_PFYbEGOOEeWL_YVya3JVNw" name="[0..*] eSuperTypes" sourceNode="_PFFgIGOOEeWL_YVya3JVNw" targetNode="_PFFgIGOOEeWL_YVya3JVNw">
-        <target xmi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/eSuperTypes"/>
-        <semanticElements xmi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/eSuperTypes"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_PFZCIGOOEeWL_YVya3JVNw" routingStyle="manhattan" strokeColor="0,0,0">
-          <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PFZCIWOOEeWL_YVya3JVNw" showIcon="false">
-            <customFeatures>labelSize</customFeatures>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_PFZCImOOEeWL_YVya3JVNw" showIcon="false" labelColor="39,76,114">
-            <customFeatures>labelSize</customFeatures>
-          </endLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_PFZCI2OOEeWL_YVya3JVNw" name="[0..*] /eAllSuperTypes" sourceNode="_PFFgIGOOEeWL_YVya3JVNw" targetNode="_PFFgIGOOEeWL_YVya3JVNw">
-        <target xmi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/eAllSuperTypes"/>
-        <semanticElements xmi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass/eAllSuperTypes"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_PFZCJ2OOEeWL_YVya3JVNw" description="_PFZCJGOOEeWL_YVya3JVNw" routingStyle="manhattan" strokeColor="114,159,207">
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_PFZCKGOOEeWL_YVya3JVNw" showIcon="false" labelColor="39,76,114">
-            <customFeatures>labelSize</customFeatures>
-          </centerLabelStyle>
-          <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_PFZCKWOOEeWL_YVya3JVNw" showIcon="false" labelColor="39,76,114">
-            <customFeatures>labelSize</customFeatures>
-          </endLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_6HBoRWOBEeWL_YVya3JVNw"/>
-      <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
-      <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
-      <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
-      <target xmi:type="ecore:EPackage" href="expression.ecore#/"/>
-    </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-  </ownedViews>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_TIk4cGgoEeWzY_kIitvDmg">
-    <ownedRepresentations xmi:type="table:DTable" xmi:id="_VXYSUGgoEeWzY_kIitvDmg" name="expression documentation" headerColumnWidth="241">
-      <target xmi:type="ecore:EPackage" href="expression.ecore#/"/>
-      <lines xmi:type="table:DLine" xmi:id="_VXYSUWgoEeWzY_kIitvDmg" label="EClass : ExpressionPackage">
-        <target xmi:type="ecore:EClass" href="expression.ecore#//SiriusExpressionPackage"/>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSUmgoEeWzY_kIitvDmg" label="EReference : expressionClasses">
-          <target xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionPackage/expressionClasses"/>
-          <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionPackage/expressionClasses"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_icS6IGgoEeWzY_kIitvDmg" label="References expression classes." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionPackage/expressionClasses/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionPackage/expressionClasses/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_icS6IWgoEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSU2goEeWzY_kIitvDmg" label="EReference : ePackage">
-          <target xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionPackage/ePackage"/>
-          <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionPackage/ePackage"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_9f0x4GgoEeWzY_kIitvDmg" label="References the ePackage of the EClasses defining expressions." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionPackage/ePackage/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionPackage/ePackage/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_9f0x4WgoEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <semanticElements xmi:type="ecore:EClass" href="expression.ecore#//SiriusExpressionPackage"/>
-        <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
-        <cells xmi:type="table:DCell" xmi:id="_h0bB0GgoEeWzY_kIitvDmg" label="An ExpressionPackage is the root concept of the expression metamodel. This metamodel is used to define the link between expressions and the variables that could be used by the expressions.An ExpressionPackage defines groups of ExpressionClasses." column="_VXYSZmgoEeWzY_kIitvDmg">
-          <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionPackage/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionPackage/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <currentStyle xmi:type="table:DCellStyle" xmi:id="_h0bB0WgoEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-            <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </currentStyle>
-          <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-        </cells>
-      </lines>
-      <lines xmi:type="table:DLine" xmi:id="_VXYSVGgoEeWzY_kIitvDmg" label="EClass : ExpressionDescription">
-        <target xmi:type="ecore:EClass" href="expression.ecore#//ExpressionDescription"/>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSVWgoEeWzY_kIitvDmg" label="EAttribute : lowerBound">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/lowerBound"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/lowerBound"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_m59i0GgpEeWzY_kIitvDmg" label="Defines the return type lower bound." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/lowerBound/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/lowerBound/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_m59i0WgpEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSVmgoEeWzY_kIitvDmg" label="EAttribute : upperBound">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/upperBound"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/upperBound"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_tbVlIGgpEeWzY_kIitvDmg" label="Defines the return type upper bound." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/upperBound/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/upperBound/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_tbVlIWgpEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSV2goEeWzY_kIitvDmg" label="EReference : expression">
-          <target xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/expression"/>
-          <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/expression"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_w7WIMGgpEeWzY_kIitvDmg" label="References an expression from another metamodel." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/expression/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/expression/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_w7WIMWgpEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSWGgoEeWzY_kIitvDmg" label="EReference : variables">
-          <target xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/variables"/>
-          <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/variables"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_JGUecGgqEeWzY_kIitvDmg" label="Contains the variables associated to an expression description." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/variables/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/variables/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_JGUecWgqEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSWWgoEeWzY_kIitvDmg" label="EReference : returnType">
-          <target xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/returnType"/>
-          <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/returnType"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_nFmyIGgpEeWzY_kIitvDmg" label="Defines the return type of an expression." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/returnType/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/returnType/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_nFmyIWgpEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSWmgoEeWzY_kIitvDmg" label="EAttribute : label">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/label"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//ExpressionDescription/label"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_CGRbwGgtEeWzY_kIitvDmg" label="Defines the label of theexpression." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/label/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/label/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_CGRbwWgtEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSW2goEeWzY_kIitvDmg" label="EReference : contextableElements">
-          <target xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/contextableElements"/>
-          <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//ExpressionDescription/contextableElements"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_wJyxoGg4EeWzY_kIitvDmg" label="References contextable elements to get the associated context variables." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/contextableElements/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/contextableElements/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_wJyxoWg4EeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <semanticElements xmi:type="ecore:EClass" href="expression.ecore#//ExpressionDescription"/>
-        <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
-        <cells xmi:type="table:DCell" xmi:id="_mO-FEGgpEeWzY_kIitvDmg" label="Defines an expression." column="_VXYSZmgoEeWzY_kIitvDmg">
-          <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//ExpressionDescription/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <currentStyle xmi:type="table:DCellStyle" xmi:id="_mO-FEWgpEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-            <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </currentStyle>
-          <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-        </cells>
-      </lines>
-      <lines xmi:type="table:DLine" xmi:id="_VXYSXGgoEeWzY_kIitvDmg" label="EClass : Variable">
-        <target xmi:type="ecore:EClass" href="expression.ecore#//Variable"/>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSXWgoEeWzY_kIitvDmg" label="EAttribute : name">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//Variable/name"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//Variable/name"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_5VGEkGgtEeWzY_kIitvDmg" label="Defines the name of the varriable." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Variable/name/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Variable/name/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_5VGEkWgtEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSXmgoEeWzY_kIitvDmg" label="EAttribute : documentation">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//Variable/documentation"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//Variable/documentation"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_7kNngGgtEeWzY_kIitvDmg" label="Defines the documentation of the variables." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Variable/documentation/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Variable/documentation/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_7kNngWgtEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <semanticElements xmi:type="ecore:EClass" href="expression.ecore#//Variable"/>
-        <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
-        <cells xmi:type="table:DCell" xmi:id="_I6AZYGgtEeWzY_kIitvDmg" label="Represents a variable." column="_VXYSZmgoEeWzY_kIitvDmg">
-          <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Variable/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Variable/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <currentStyle xmi:type="table:DCellStyle" xmi:id="_I6AZYWgtEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-            <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </currentStyle>
-          <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-        </cells>
-      </lines>
-      <lines xmi:type="table:DLine" xmi:id="_VXYSX2goEeWzY_kIitvDmg" label="EClass : ExpressionClass">
-        <target xmi:type="ecore:EClass" href="expression.ecore#//SiriusExpressionClass"/>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSYGgoEeWzY_kIitvDmg" label="EReference : variables">
-          <target xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionClass/variables"/>
-          <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionClass/variables"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_8mdGoGg4EeWzY_kIitvDmg" label="References the variables. Variables are global as they can be referenced by any expression description." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionClass/variables/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionClass/variables/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_8mdGoWg4EeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSYWgoEeWzY_kIitvDmg" label="EReference : expressionDescriptions">
-          <target xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionClass/expressionDescriptions"/>
-          <semanticElements xmi:type="ecore:EReference" href="expression.ecore#//SiriusExpressionClass/expressionDescriptions"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_9EQc8Gg4EeWzY_kIitvDmg" label="References the expressions." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionClass/expressionDescriptions/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionClass/expressionDescriptions/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_9EQc8Wg4EeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <lines xmi:type="table:DLine" xmi:id="_VXYSYmgoEeWzY_kIitvDmg" label="EAttribute : label">
-          <target xmi:type="ecore:EAttribute" href="expression.ecore#//SiriusExpressionClass/label"/>
-          <semanticElements xmi:type="ecore:EAttribute" href="expression.ecore#//SiriusExpressionClass/label"/>
-          <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
-          <cells xmi:type="table:DCell" xmi:id="_BRIGAGg5EeWzY_kIitvDmg" label="Lable to identify an expression class." column="_VXYSZmgoEeWzY_kIitvDmg">
-            <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionClass/label/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionClass/label/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-            <currentStyle xmi:type="table:DCellStyle" xmi:id="_BRIGAWg5EeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-              <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-            </currentStyle>
-            <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </cells>
-        </lines>
-        <semanticElements xmi:type="ecore:EClass" href="expression.ecore#//SiriusExpressionClass"/>
-        <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
-        <cells xmi:type="table:DCell" xmi:id="_F6oBsGguEeWzY_kIitvDmg" label="Holds expression descriptions and variables." column="_VXYSZmgoEeWzY_kIitvDmg">
-          <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionClass/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//SiriusExpressionClass/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <currentStyle xmi:type="table:DCellStyle" xmi:id="_F6oBsWguEeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-            <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </currentStyle>
-          <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-        </cells>
-      </lines>
-      <lines xmi:type="table:DLine" xmi:id="_VXYSY2goEeWzY_kIitvDmg" label="EDataType : Void">
-        <target xmi:type="ecore:EDataType" href="expression.ecore#//Void"/>
-        <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Void"/>
-        <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
-        <cells xmi:type="table:DCell" xmi:id="_EYgGoGg5EeWzY_kIitvDmg" label="Represents the void type used when an expression does not return anything." column="_VXYSZmgoEeWzY_kIitvDmg">
-          <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Void/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Void/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <currentStyle xmi:type="table:DCellStyle" xmi:id="_EYgGoWg5EeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-            <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </currentStyle>
-          <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-        </cells>
-      </lines>
-      <lines xmi:type="table:DLine" xmi:id="_VXYSZGgoEeWzY_kIitvDmg" label="EDataType : Object">
-        <target xmi:type="ecore:EDataType" href="expression.ecore#//Object"/>
-        <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Object"/>
-        <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
-        <cells xmi:type="table:DCell" xmi:id="_EjyJkGg5EeWzY_kIitvDmg" label="Represents a Java.lang.Object." column="_VXYSZmgoEeWzY_kIitvDmg">
-          <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Object/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Object/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <currentStyle xmi:type="table:DCellStyle" xmi:id="_EjyJkWg5EeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-            <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </currentStyle>
-          <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-        </cells>
-      </lines>
-      <lines xmi:type="table:DLine" xmi:id="_VXYSZWgoEeWzY_kIitvDmg" label="EDataType : Predicate">
-        <target xmi:type="ecore:EDataType" href="expression.ecore#//Predicate"/>
-        <semanticElements xmi:type="ecore:EDataType" href="expression.ecore#//Predicate"/>
-        <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
-        <cells xmi:type="table:DCell" xmi:id="_M7XfkGg5EeWzY_kIitvDmg" label="Represents a guava predicate." column="_VXYSZmgoEeWzY_kIitvDmg">
-          <target xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Predicate/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <semanticElements xmi:type="ecore:EStringToStringMapEntry" href="expression.ecore#//Predicate/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FGenModel%/@details.0"/>
-          <currentStyle xmi:type="table:DCellStyle" xmi:id="_M7XfkWg5EeWzY_kIitvDmg" defaultBackgroundStyle="true" backgroundColor="220,234,183">
-            <backgroundStyleOrigin xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-          </currentStyle>
-          <intersectionMapping xmi:type="description_2:IntersectionMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@intersection.0"/>
-        </cells>
-      </lines>
-      <columns xmi:type="table:DTargetColumn" xmi:id="_VXYSZmgoEeWzY_kIitvDmg" label="Domain Documentation" cells="_icS6IGgoEeWzY_kIitvDmg _9f0x4GgoEeWzY_kIitvDmg _h0bB0GgoEeWzY_kIitvDmg _m59i0GgpEeWzY_kIitvDmg _tbVlIGgpEeWzY_kIitvDmg _w7WIMGgpEeWzY_kIitvDmg _nFmyIGgpEeWzY_kIitvDmg _JGUecGgqEeWzY_kIitvDmg _CGRbwGgtEeWzY_kIitvDmg _mO-FEGgpEeWzY_kIitvDmg _5VGEkGgtEeWzY_kIitvDmg _7kNngGgtEeWzY_kIitvDmg _I6AZYGgtEeWzY_kIitvDmg _wJyxoGg4EeWzY_kIitvDmg _8mdGoGg4EeWzY_kIitvDmg _9EQc8Gg4EeWzY_kIitvDmg _BRIGAGg5EeWzY_kIitvDmg _F6oBsGguEeWzY_kIitvDmg _EYgGoGg5EeWzY_kIitvDmg _EjyJkGg5EeWzY_kIitvDmg _M7XfkGg5EeWzY_kIitvDmg">
-        <target xmi:type="ecore:EPackage" href="expression.ecore#/"/>
-        <semanticElements xmi:type="ecore:EPackage" href="expression.ecore#/"/>
-        <originMapping xmi:type="description_2:ElementColumnMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0"/>
-      </columns>
-      <description xmi:type="description_2:CrossTableDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']"/>
-    </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
-  </ownedViews>
-</viewpoint:DAnalysis>
diff --git a/incubation/org.eclipse.sirius.expression/model/expression.ecore b/incubation/org.eclipse.sirius.expression/model/expression.ecore
deleted file mode 100644
index b932578e10..0000000000
--- a/incubation/org.eclipse.sirius.expression/model/expression.ecore
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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="expression" nsURI="http://www.eclipse.org/sirius/expression"
-    nsPrefix="expression">
-  <eClassifiers xsi:type="ecore:EClass" name="SiriusExpressionPackage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An ExpressionPackage is the root concept of the expression metamodel. This metamodel is used to define the link between expressions and the variables that could be used by the expressions.An ExpressionPackage defines groups of ExpressionClasses."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expressionClasses" upperBound="-1"
-        eType="#//SiriusExpressionClass" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="References expression classes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="References the ePackage of the EClasses defining expressions."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SiriusExpressionDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Defines an expression."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lowerBound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the return type lower bound."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="upperBound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the return type upper bound."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="References an expression from another metamodel."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
-        eType="#//SiriusParameter" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Contains the variables associated to an expression description."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClassifier">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the return type of an expression."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variableContainers" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="References contextable elements to get the associated context variables."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SiriusVariable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a variable."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the name of the varriable."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="documentation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the documentation of the variables."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eType" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClassifier"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SiriusExpressionClass">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Holds expression descriptions and variables."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"
-        eType="#//SiriusVariable" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="References the variables. Variables are global as they can be referenced by any expression description."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="expressionDescriptions"
-        upperBound="-1" eType="#//SiriusExpressionDescription" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="References the expressions."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eClass" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SiriusParameter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//SiriusVariable"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UserDefinedVariable" eSuperTypes="#//SiriusVariable">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="#//Expression"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Void" instanceClassName="java.lang.Void">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents the void type used when an expression does not return anything."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Object" instanceClassName="java.lang.Object">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a Java.lang.Object."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Predicate" instanceClassName="java.lang.Object">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a guava predicate."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Expression" instanceClassName="java.lang.String">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Expression interpreted using the available interpreters in the EEF runtime."/>
-    </eAnnotations>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/incubation/org.eclipse.sirius.expression/model/expression.genmodel b/incubation/org.eclipse.sirius.expression/model/expression.genmodel
deleted file mode 100644
index 9cbc408290..0000000000
--- a/incubation/org.eclipse.sirius.expression/model/expression.genmodel
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 Obeo.&#xA;All rights reserved. This program and the accompanying materials &#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.htm"
-    modelDirectory="/org.eclipse.sirius.expression/src-gen" creationIcons="false"
-    editDirectory="/org.eclipse.sirius.expression.edit/src-gen" editorDirectory="/org.eclipse.sirius.expression.editor/src-gen"
-    modelPluginID="org.eclipse.sirius.expression" modelName="Expression" nonNLSMarkers="true"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" complianceLevel="6.0"
-    copyrightFields="false" language="" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>expression.ecore</foreignModel>
-  <genPackages prefix="Expression" basePackage="org.eclipse.sirius" disposableProviderFactory="true"
-      ecorePackage="expression.ecore#/">
-    <genDataTypes ecoreDataType="expression.ecore#//Void"/>
-    <genDataTypes ecoreDataType="expression.ecore#//Object"/>
-    <genDataTypes ecoreDataType="expression.ecore#//Predicate"/>
-    <genDataTypes ecoreDataType="expression.ecore#//Expression"/>
-    <genClasses ecoreClass="expression.ecore#//SiriusExpressionPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionPackage/expressionClasses"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionPackage/ePackage"/>
-    </genClasses>
-    <genClasses ecoreClass="expression.ecore#//SiriusExpressionDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute expression.ecore#//SiriusExpressionDescription/lowerBound"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute expression.ecore#//SiriusExpressionDescription/upperBound"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionDescription/expression"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionDescription/parameters"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionDescription/returnType"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionDescription/variableContainers"/>
-    </genClasses>
-    <genClasses ecoreClass="expression.ecore#//SiriusVariable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute expression.ecore#//SiriusVariable/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute expression.ecore#//SiriusVariable/documentation"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusVariable/eType"/>
-    </genClasses>
-    <genClasses ecoreClass="expression.ecore#//SiriusExpressionClass">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionClass/variables"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionClass/expressionDescriptions"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusExpressionClass/eClass"/>
-    </genClasses>
-    <genClasses ecoreClass="expression.ecore#//SiriusParameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute expression.ecore#//SiriusParameter/optional"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference expression.ecore#//SiriusParameter/variable"/>
-    </genClasses>
-    <genClasses ecoreClass="expression.ecore#//UserDefinedVariable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute expression.ecore#//UserDefinedVariable/valueExpression"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/incubation/org.eclipse.sirius.expression/plugin.properties b/incubation/org.eclipse.sirius.expression/plugin.properties
deleted file mode 100644
index ea65427aef..0000000000
--- a/incubation/org.eclipse.sirius.expression/plugin.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2015 Obeo.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.htm
-
-pluginName = Sirius Expression Model
-providerName = Eclipse Modeling Project
diff --git a/incubation/org.eclipse.sirius.expression/plugin.xml b/incubation/org.eclipse.sirius.expression/plugin.xml
deleted file mode 100644
index 975d0f12f4..0000000000
--- a/incubation/org.eclipse.sirius.expression/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2015 Obeo.
- All rights reserved. This program and the accompanying materials 
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.htm
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated expression -->
-      <package
-            uri="http://www.eclipse.org/sirius/expression"
-            class="org.eclipse.sirius.expression.ExpressionPackage"
-            genModel="model/expression.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/ExpressionFactory.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/ExpressionFactory.java
deleted file mode 100644
index 0a3d1eeaab..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/ExpressionFactory.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
- * the model. <!-- end-user-doc -->
- * @see org.eclipse.sirius.expression.ExpressionPackage
- * @generated
- */
-public interface ExpressionFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	ExpressionFactory eINSTANCE = org.eclipse.sirius.expression.impl.ExpressionFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Sirius Expression Package</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Sirius Expression Package</em>'.
-	 * @generated
-	 */
-	SiriusExpressionPackage createSiriusExpressionPackage();
-
-	/**
-	 * Returns a new object of class '<em>Sirius Expression Description</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @return a new object of class '<em>Sirius Expression Description</em>'.
-	 * @generated
-	 */
-	SiriusExpressionDescription createSiriusExpressionDescription();
-
-	/**
-	 * Returns a new object of class '<em>Sirius Variable</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Sirius Variable</em>'.
-	 * @generated
-	 */
-	SiriusVariable createSiriusVariable();
-
-	/**
-	 * Returns a new object of class '<em>Sirius Expression Class</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Sirius Expression Class</em>'.
-	 * @generated
-	 */
-	SiriusExpressionClass createSiriusExpressionClass();
-
-	/**
-	 * Returns a new object of class '<em>Sirius Parameter</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Sirius Parameter</em>'.
-	 * @generated
-	 */
-	SiriusParameter createSiriusParameter();
-
-	/**
-	 * Returns a new object of class '<em>User Defined Variable</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>User Defined Variable</em>'.
-	 * @generated
-	 */
-	UserDefinedVariable createUserDefinedVariable();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ExpressionPackage getExpressionPackage();
-
-} // ExpressionFactory
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/ExpressionPackage.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/ExpressionPackage.java
deleted file mode 100644
index 8dbb272134..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/ExpressionPackage.java
+++ /dev/null
@@ -1,952 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.sirius.expression.ExpressionFactory
- * @model kind="package"
- * @generated
- */
-public interface ExpressionPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "expression"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/sirius/expression"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "expression"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	ExpressionPackage eINSTANCE = org.eclipse.sirius.expression.impl.ExpressionPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.sirius.expression.impl.SiriusExpressionPackageImpl <em>Sirius Expression Package</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.sirius.expression.impl.SiriusExpressionPackageImpl
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusExpressionPackage()
-	 * @generated
-	 */
-	int SIRIUS_EXPRESSION_PACKAGE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Expression Classes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES = 0;
-
-	/**
-	 * The feature id for the '<em><b>EPackage</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_PACKAGE__EPACKAGE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Sirius Expression Package</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_PACKAGE_FEATURE_COUNT = 2;
-
-	/**
-	 * The number of operations of the '<em>Sirius Expression Package</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_PACKAGE_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl <em>Sirius Expression Description</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusExpressionDescription()
-	 * @generated
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND = 0;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND = 1;
-
-	/**
-	 * The feature id for the '<em><b>Expression</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Return Type</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Variable Containers</b></em>' reference list.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS = 5;
-
-	/**
-	 * The number of structural features of the '<em>Sirius Expression Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION_FEATURE_COUNT = 6;
-
-	/**
-	 * The number of operations of the '<em>Sirius Expression Description</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_DESCRIPTION_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.sirius.expression.impl.SiriusVariableImpl <em>Sirius Variable</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.sirius.expression.impl.SiriusVariableImpl
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusVariable()
-	 * @generated
-	 */
-	int SIRIUS_VARIABLE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_VARIABLE__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_VARIABLE__DOCUMENTATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_VARIABLE__ETYPE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Sirius Variable</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_VARIABLE_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Sirius Variable</em>' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_VARIABLE_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.sirius.expression.impl.SiriusExpressionClassImpl <em>Sirius Expression Class</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.sirius.expression.impl.SiriusExpressionClassImpl
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusExpressionClass()
-	 * @generated
-	 */
-	int SIRIUS_EXPRESSION_CLASS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Variables</b></em>' containment reference list.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_CLASS__VARIABLES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Expression Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS = 1;
-
-	/**
-	 * The feature id for the '<em><b>EClass</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_CLASS__ECLASS = 2;
-
-	/**
-	 * The number of structural features of the '<em>Sirius Expression Class</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_CLASS_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Sirius Expression Class</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_EXPRESSION_CLASS_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.sirius.expression.impl.SiriusParameterImpl <em>Sirius Parameter</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.sirius.expression.impl.SiriusParameterImpl
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusParameter()
-	 * @generated
-	 */
-	int SIRIUS_PARAMETER = 4;
-
-	/**
-	 * The feature id for the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_PARAMETER__OPTIONAL = 0;
-
-	/**
-	 * The feature id for the '<em><b>Variable</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_PARAMETER__VARIABLE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Sirius Parameter</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_PARAMETER_FEATURE_COUNT = 2;
-
-	/**
-	 * The number of operations of the '<em>Sirius Parameter</em>' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIRIUS_PARAMETER_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.sirius.expression.impl.UserDefinedVariableImpl <em>User Defined Variable</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.sirius.expression.impl.UserDefinedVariableImpl
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getUserDefinedVariable()
-	 * @generated
-	 */
-	int USER_DEFINED_VARIABLE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DEFINED_VARIABLE__NAME = SIRIUS_VARIABLE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DEFINED_VARIABLE__DOCUMENTATION = SIRIUS_VARIABLE__DOCUMENTATION;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DEFINED_VARIABLE__ETYPE = SIRIUS_VARIABLE__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DEFINED_VARIABLE__VALUE_EXPRESSION = SIRIUS_VARIABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>User Defined Variable</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DEFINED_VARIABLE_FEATURE_COUNT = SIRIUS_VARIABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>User Defined Variable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DEFINED_VARIABLE_OPERATION_COUNT = SIRIUS_VARIABLE_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '<em>Void</em>' data type.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see java.lang.Void
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getVoid()
-	 * @generated
-	 */
-	int VOID = 6;
-
-	/**
-	 * The meta object id for the '<em>Object</em>' data type.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see java.lang.Object
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getObject()
-	 * @generated
-	 */
-	int OBJECT = 7;
-
-	/**
-	 * The meta object id for the '<em>Predicate</em>' data type.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see java.lang.Object
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getPredicate()
-	 * @generated
-	 */
-	int PREDICATE = 8;
-
-	/**
-	 * The meta object id for the '<em>Expression</em>' data type.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getExpression()
-	 * @generated
-	 */
-	int EXPRESSION = 9;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.sirius.expression.SiriusExpressionPackage <em>Sirius Expression Package</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Sirius Expression Package</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionPackage
-	 * @generated
-	 */
-	EClass getSiriusExpressionPackage();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.expression.SiriusExpressionPackage#getExpressionClasses <em>Expression Classes</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Expression Classes</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionPackage#getExpressionClasses()
-	 * @see #getSiriusExpressionPackage()
-	 * @generated
-	 */
-	EReference getSiriusExpressionPackage_ExpressionClasses();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.sirius.expression.SiriusExpressionPackage#getEPackage <em>EPackage</em>}'.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>EPackage</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionPackage#getEPackage()
-	 * @see #getSiriusExpressionPackage()
-	 * @generated
-	 */
-	EReference getSiriusExpressionPackage_EPackage();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.sirius.expression.SiriusExpressionDescription <em>Sirius Expression Description</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Sirius Expression Description</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionDescription
-	 * @generated
-	 */
-	EClass getSiriusExpressionDescription();
-
-	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.sirius.expression.SiriusExpressionDescription#getLowerBound <em>Lower Bound</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Lower Bound</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionDescription#getLowerBound()
-	 * @see #getSiriusExpressionDescription()
-	 * @generated
-	 */
-	EAttribute getSiriusExpressionDescription_LowerBound();
-
-	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.sirius.expression.SiriusExpressionDescription#getUpperBound <em>Upper Bound</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Upper Bound</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionDescription#getUpperBound()
-	 * @see #getSiriusExpressionDescription()
-	 * @generated
-	 */
-	EAttribute getSiriusExpressionDescription_UpperBound();
-
-	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.sirius.expression.SiriusExpressionDescription#getExpression <em>Expression</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionDescription#getExpression()
-	 * @see #getSiriusExpressionDescription()
-	 * @generated
-	 */
-	EReference getSiriusExpressionDescription_Expression();
-
-	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.sirius.expression.SiriusExpressionDescription#getParameters <em>Parameters</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '<em>Parameters</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionDescription#getParameters()
-	 * @see #getSiriusExpressionDescription()
-	 * @generated
-	 */
-	EReference getSiriusExpressionDescription_Parameters();
-
-	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.sirius.expression.SiriusExpressionDescription#getReturnType <em>Return Type</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Return Type</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionDescription#getReturnType()
-	 * @see #getSiriusExpressionDescription()
-	 * @generated
-	 */
-	EReference getSiriusExpressionDescription_ReturnType();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getVariableContainers <em>Variable Containers</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Variable Containers</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionDescription#getVariableContainers()
-	 * @see #getSiriusExpressionDescription()
-	 * @generated
-	 */
-	EReference getSiriusExpressionDescription_VariableContainers();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.sirius.expression.SiriusVariable <em>Sirius Variable</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Sirius Variable</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusVariable
-	 * @generated
-	 */
-	EClass getSiriusVariable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.sirius.expression.SiriusVariable#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusVariable#getName()
-	 * @see #getSiriusVariable()
-	 * @generated
-	 */
-	EAttribute getSiriusVariable_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.sirius.expression.SiriusVariable#getDocumentation <em>Documentation</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Documentation</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusVariable#getDocumentation()
-	 * @see #getSiriusVariable()
-	 * @generated
-	 */
-	EAttribute getSiriusVariable_Documentation();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.sirius.expression.SiriusVariable#getEType <em>EType</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>EType</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusVariable#getEType()
-	 * @see #getSiriusVariable()
-	 * @generated
-	 */
-	EReference getSiriusVariable_EType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.sirius.expression.SiriusExpressionClass <em>Sirius Expression Class</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Sirius Expression Class</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionClass
-	 * @generated
-	 */
-	EClass getSiriusExpressionClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.expression.SiriusExpressionClass#getVariables <em>Variables</em>}'.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Variables</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionClass#getVariables()
-	 * @see #getSiriusExpressionClass()
-	 * @generated
-	 */
-	EReference getSiriusExpressionClass_Variables();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.expression.SiriusExpressionClass#getExpressionDescriptions <em>Expression Descriptions</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Expression Descriptions</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionClass#getExpressionDescriptions()
-	 * @see #getSiriusExpressionClass()
-	 * @generated
-	 */
-	EReference getSiriusExpressionClass_ExpressionDescriptions();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.sirius.expression.SiriusExpressionClass#getEClass <em>EClass</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>EClass</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionClass#getEClass()
-	 * @see #getSiriusExpressionClass()
-	 * @generated
-	 */
-	EReference getSiriusExpressionClass_EClass();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.sirius.expression.SiriusParameter <em>Sirius Parameter</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Sirius Parameter</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusParameter
-	 * @generated
-	 */
-	EClass getSiriusParameter();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.sirius.expression.SiriusParameter#isOptional <em>Optional</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Optional</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusParameter#isOptional()
-	 * @see #getSiriusParameter()
-	 * @generated
-	 */
-	EAttribute getSiriusParameter_Optional();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.sirius.expression.SiriusParameter#getVariable <em>Variable</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Variable</em>'.
-	 * @see org.eclipse.sirius.expression.SiriusParameter#getVariable()
-	 * @see #getSiriusParameter()
-	 * @generated
-	 */
-	EReference getSiriusParameter_Variable();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.sirius.expression.UserDefinedVariable <em>User Defined Variable</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for class '<em>User Defined Variable</em>'.
-	 * @see org.eclipse.sirius.expression.UserDefinedVariable
-	 * @generated
-	 */
-	EClass getUserDefinedVariable();
-
-	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.sirius.expression.UserDefinedVariable#getValueExpression <em>Value Expression</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Value Expression</em>'.
-	 * @see org.eclipse.sirius.expression.UserDefinedVariable#getValueExpression()
-	 * @see #getUserDefinedVariable()
-	 * @generated
-	 */
-	EAttribute getUserDefinedVariable_ValueExpression();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.Void <em>Void</em>}'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return the meta object for data type '<em>Void</em>'.
-	 * @see java.lang.Void
-	 * @model instanceClass="java.lang.Void"
-	 * @generated
-	 */
-	EDataType getVoid();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.Object <em>Object</em>}'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return the meta object for data type '<em>Object</em>'.
-	 * @see java.lang.Object
-	 * @model instanceClass="java.lang.Object"
-	 * @generated
-	 */
-	EDataType getObject();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.Object <em>Predicate</em>}'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return the meta object for data type '<em>Predicate</em>'.
-	 * @see java.lang.Object
-	 * @model instanceClass="java.lang.Object"
-	 * @generated
-	 */
-	EDataType getPredicate();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Expression</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 * @generated
-	 */
-	EDataType getExpression();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ExpressionFactory getExpressionFactory();
-
-	/**
-	 * <!-- begin-user-doc --> Defines literals for the meta objects that represent
-	 * <ul>
-	 * <li>each class,</li>
-	 * <li>each feature of each class,</li>
-	 * <li>each operation of each class,</li>
-	 * <li>each enum,</li>
-	 * <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.sirius.expression.impl.SiriusExpressionPackageImpl <em>Sirius Expression Package</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see org.eclipse.sirius.expression.impl.SiriusExpressionPackageImpl
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusExpressionPackage()
-		 * @generated
-		 */
-		EClass SIRIUS_EXPRESSION_PACKAGE = eINSTANCE.getSiriusExpressionPackage();
-
-		/**
-		 * The meta object literal for the '<em><b>Expression Classes</b></em>' containment reference list feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES = eINSTANCE.getSiriusExpressionPackage_ExpressionClasses();
-
-		/**
-		 * The meta object literal for the '<em><b>EPackage</b></em>' reference feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_PACKAGE__EPACKAGE = eINSTANCE.getSiriusExpressionPackage_EPackage();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl <em>Sirius Expression Description</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusExpressionDescription()
-		 * @generated
-		 */
-		EClass SIRIUS_EXPRESSION_DESCRIPTION = eINSTANCE.getSiriusExpressionDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Lower Bound</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND = eINSTANCE.getSiriusExpressionDescription_LowerBound();
-
-		/**
-		 * The meta object literal for the '<em><b>Upper Bound</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND = eINSTANCE.getSiriusExpressionDescription_UpperBound();
-
-		/**
-		 * The meta object literal for the '<em><b>Expression</b></em>' reference feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION = eINSTANCE.getSiriusExpressionDescription_Expression();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS = eINSTANCE.getSiriusExpressionDescription_Parameters();
-
-		/**
-		 * The meta object literal for the '<em><b>Return Type</b></em>' reference feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE = eINSTANCE.getSiriusExpressionDescription_ReturnType();
-
-		/**
-		 * The meta object literal for the '<em><b>Variable Containers</b></em>' reference list feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS = eINSTANCE.getSiriusExpressionDescription_VariableContainers();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.sirius.expression.impl.SiriusVariableImpl <em>Sirius Variable</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see org.eclipse.sirius.expression.impl.SiriusVariableImpl
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusVariable()
-		 * @generated
-		 */
-		EClass SIRIUS_VARIABLE = eINSTANCE.getSiriusVariable();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SIRIUS_VARIABLE__NAME = eINSTANCE.getSiriusVariable_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Documentation</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SIRIUS_VARIABLE__DOCUMENTATION = eINSTANCE.getSiriusVariable_Documentation();
-
-		/**
-		 * The meta object literal for the '<em><b>EType</b></em>' reference feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EReference SIRIUS_VARIABLE__ETYPE = eINSTANCE.getSiriusVariable_EType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.sirius.expression.impl.SiriusExpressionClassImpl <em>Sirius Expression Class</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see org.eclipse.sirius.expression.impl.SiriusExpressionClassImpl
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusExpressionClass()
-		 * @generated
-		 */
-		EClass SIRIUS_EXPRESSION_CLASS = eINSTANCE.getSiriusExpressionClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_CLASS__VARIABLES = eINSTANCE.getSiriusExpressionClass_Variables();
-
-		/**
-		 * The meta object literal for the '<em><b>Expression Descriptions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS = eINSTANCE.getSiriusExpressionClass_ExpressionDescriptions();
-
-		/**
-		 * The meta object literal for the '<em><b>EClass</b></em>' reference feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EReference SIRIUS_EXPRESSION_CLASS__ECLASS = eINSTANCE.getSiriusExpressionClass_EClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.sirius.expression.impl.SiriusParameterImpl <em>Sirius Parameter</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see org.eclipse.sirius.expression.impl.SiriusParameterImpl
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getSiriusParameter()
-		 * @generated
-		 */
-		EClass SIRIUS_PARAMETER = eINSTANCE.getSiriusParameter();
-
-		/**
-		 * The meta object literal for the '<em><b>Optional</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SIRIUS_PARAMETER__OPTIONAL = eINSTANCE.getSiriusParameter_Optional();
-
-		/**
-		 * The meta object literal for the '<em><b>Variable</b></em>' reference feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EReference SIRIUS_PARAMETER__VARIABLE = eINSTANCE.getSiriusParameter_Variable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.sirius.expression.impl.UserDefinedVariableImpl <em>User Defined Variable</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see org.eclipse.sirius.expression.impl.UserDefinedVariableImpl
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getUserDefinedVariable()
-		 * @generated
-		 */
-		EClass USER_DEFINED_VARIABLE = eINSTANCE.getUserDefinedVariable();
-
-		/**
-		 * The meta object literal for the '<em><b>Value Expression</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER_DEFINED_VARIABLE__VALUE_EXPRESSION = eINSTANCE.getUserDefinedVariable_ValueExpression();
-
-		/**
-		 * The meta object literal for the '<em>Void</em>' data type.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see java.lang.Void
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getVoid()
-		 * @generated
-		 */
-		EDataType VOID = eINSTANCE.getVoid();
-
-		/**
-		 * The meta object literal for the '<em>Object</em>' data type.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see java.lang.Object
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getObject()
-		 * @generated
-		 */
-		EDataType OBJECT = eINSTANCE.getObject();
-
-		/**
-		 * The meta object literal for the '<em>Predicate</em>' data type.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * @see java.lang.Object
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getPredicate()
-		 * @generated
-		 */
-		EDataType PREDICATE = eINSTANCE.getPredicate();
-
-		/**
-		 * The meta object literal for the '<em>Expression</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
-		 * -->
-		 * 
-		 * @see java.lang.String
-		 * @see org.eclipse.sirius.expression.impl.ExpressionPackageImpl#getExpression()
-		 * @generated
-		 */
-		EDataType EXPRESSION = eINSTANCE.getExpression();
-
-	}
-
-} // ExpressionPackage
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionClass.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionClass.java
deleted file mode 100644
index 779cd7aa6a..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionClass.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Sirius Expression Class</b></em>'. <!--
- * end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Holds expression descriptions and variables.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionClass#getVariables <em>Variables</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionClass#getExpressionDescriptions <em>Expression Descriptions</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionClass#getEClass <em>EClass</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionClass()
- * @model
- * @generated
- */
-public interface SiriusExpressionClass extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Variables</b></em>' containment reference list. The list contents are of type
-	 * {@link org.eclipse.sirius.expression.SiriusVariable}. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> References the variables. Variables are global as they can be referenced by any expression
-	 * description. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Variables</em>' containment reference list.
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionClass_Variables()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SiriusVariable> getVariables();
-
-	/**
-	 * Returns the value of the '<em><b>Expression Descriptions</b></em>' containment reference list. The list contents
-	 * are of type {@link org.eclipse.sirius.expression.SiriusExpressionDescription}. <!-- begin-user-doc --> <!--
-	 * end-user-doc --> <!-- begin-model-doc --> References the expressions. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Expression Descriptions</em>' containment reference list.
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionClass_ExpressionDescriptions()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SiriusExpressionDescription> getExpressionDescriptions();
-
-	/**
-	 * Returns the value of the '<em><b>EClass</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EClass</em>' reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EClass</em>' reference.
-	 * @see #setEClass(EClass)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionClass_EClass()
-	 * @model
-	 * @generated
-	 */
-	EClass getEClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusExpressionClass#getEClass <em>EClass</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EClass</em>' reference.
-	 * @see #getEClass()
-	 * @generated
-	 */
-	void setEClass(EClass value);
-
-} // SiriusExpressionClass
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionDescription.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionDescription.java
deleted file mode 100644
index 8c695cd384..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionDescription.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Sirius Expression Description</b></em>'. <!--
- * end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Defines an expression.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getLowerBound <em>Lower Bound</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getUpperBound <em>Upper Bound</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getReturnType <em>Return Type</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getVariableContainers <em>Variable Containers</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionDescription()
- * @model
- * @generated
- */
-public interface SiriusExpressionDescription extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the return type lower bound.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Lower Bound</em>' attribute.
-	 * @see #setLowerBound(int)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionDescription_LowerBound()
-	 * @model
-	 * @generated
-	 */
-	int getLowerBound();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getLowerBound <em>Lower Bound</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lower Bound</em>' attribute.
-	 * @see #getLowerBound()
-	 * @generated
-	 */
-	void setLowerBound(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Upper Bound</b></em>' attribute. The default value is <code>"1"</code>. <!--
-	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Defines the return type upper bound. <!--
-	 * end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Upper Bound</em>' attribute.
-	 * @see #setUpperBound(int)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionDescription_UpperBound()
-	 * @model default="1"
-	 * @generated
-	 */
-	int getUpperBound();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getUpperBound <em>Upper Bound</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Upper Bound</em>' attribute.
-	 * @see #getUpperBound()
-	 * @generated
-	 */
-	void setUpperBound(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * References an expression from another metamodel.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Expression</em>' reference.
-	 * @see #setExpression(EStructuralFeature)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionDescription_Expression()
-	 * @model
-	 * @generated
-	 */
-	EStructuralFeature getExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getExpression <em>Expression</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' reference.
-	 * @see #getExpression()
-	 * @generated
-	 */
-	void setExpression(EStructuralFeature value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list. The list contents are of type
-	 * {@link org.eclipse.sirius.expression.SiriusParameter}. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> Contains the variables associated to an expression description. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Parameters</em>' containment reference list.
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionDescription_Parameters()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SiriusParameter> getParameters();
-
-	/**
-	 * Returns the value of the '<em><b>Return Type</b></em>' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the return type of an expression.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Return Type</em>' reference.
-	 * @see #setReturnType(EClassifier)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionDescription_ReturnType()
-	 * @model
-	 * @generated
-	 */
-	EClassifier getReturnType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusExpressionDescription#getReturnType <em>Return Type</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Type</em>' reference.
-	 * @see #getReturnType()
-	 * @generated
-	 */
-	void setReturnType(EClassifier value);
-
-	/**
-	 * Returns the value of the '<em><b>Variable Containers</b></em>' reference list. The list contents are of type
-	 * {@link org.eclipse.emf.ecore.EClass}. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
-	 * References contextable elements to get the associated context variables. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Variable Containers</em>' reference list.
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionDescription_VariableContainers()
-	 * @model
-	 * @generated
-	 */
-	EList<EClass> getVariableContainers();
-
-} // SiriusExpressionDescription
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionPackage.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionPackage.java
deleted file mode 100644
index a3aef756dd..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusExpressionPackage.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Sirius Expression Package</b></em>'. <!--
- * end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An ExpressionPackage is the root concept of the expression metamodel. This metamodel is used to define the link between expressions and the variables that could be used by the expressions.An ExpressionPackage defines groups of ExpressionClasses.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionPackage#getExpressionClasses <em>Expression Classes</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusExpressionPackage#getEPackage <em>EPackage</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionPackage()
- * @model
- * @generated
- */
-public interface SiriusExpressionPackage extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Expression Classes</b></em>' containment reference list. The list contents are
-	 * of type {@link org.eclipse.sirius.expression.SiriusExpressionClass}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * --> <!-- begin-model-doc --> References expression classes. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Expression Classes</em>' containment reference list.
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionPackage_ExpressionClasses()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SiriusExpressionClass> getExpressionClasses();
-
-	/**
-	 * Returns the value of the '<em><b>EPackage</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> References the ePackage of the EClasses defining expressions. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>EPackage</em>' reference.
-	 * @see #setEPackage(EPackage)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusExpressionPackage_EPackage()
-	 * @model
-	 * @generated
-	 */
-	EPackage getEPackage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusExpressionPackage#getEPackage <em>EPackage</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EPackage</em>' reference.
-	 * @see #getEPackage()
-	 * @generated
-	 */
-	void setEPackage(EPackage value);
-
-} // SiriusExpressionPackage
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusParameter.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusParameter.java
deleted file mode 100644
index 6ce92444f8..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusParameter.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Sirius Parameter</b></em>'. <!-- end-user-doc
- * -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.sirius.expression.SiriusParameter#isOptional <em>Optional</em>}</li>
- * <li>{@link org.eclipse.sirius.expression.SiriusParameter#getVariable <em>Variable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusParameter()
- * @model
- * @generated
- */
-public interface SiriusParameter extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional</em>' attribute.
-	 * @see #setOptional(boolean)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusParameter_Optional()
-	 * @model
-	 * @generated
-	 */
-	boolean isOptional();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusParameter#isOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
-	 * @see #isOptional()
-	 * @generated
-	 */
-	void setOptional(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Variable</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variable</em>' reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Variable</em>' reference.
-	 * @see #setVariable(SiriusVariable)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusParameter_Variable()
-	 * @model
-	 * @generated
-	 */
-	SiriusVariable getVariable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusParameter#getVariable <em>Variable</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variable</em>' reference.
-	 * @see #getVariable()
-	 * @generated
-	 */
-	void setVariable(SiriusVariable value);
-
-} // SiriusParameter
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusVariable.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusVariable.java
deleted file mode 100644
index 4b9601bd94..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/SiriusVariable.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Sirius Variable</b></em>'. <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents a variable.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.SiriusVariable#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusVariable#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.SiriusVariable#getEType <em>EType</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusVariable()
- * @model
- * @generated
- */
-public interface SiriusVariable extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> Defines the name of the varriable. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusVariable_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusVariable#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Documentation</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the documentation of the variables.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Documentation</em>' attribute.
-	 * @see #setDocumentation(String)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusVariable_Documentation()
-	 * @model
-	 * @generated
-	 */
-	String getDocumentation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusVariable#getDocumentation <em>Documentation</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Documentation</em>' attribute.
-	 * @see #getDocumentation()
-	 * @generated
-	 */
-	void setDocumentation(String value);
-
-	/**
-	 * Returns the value of the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EType</em>' reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EType</em>' reference.
-	 * @see #setEType(EClassifier)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getSiriusVariable_EType()
-	 * @model
-	 * @generated
-	 */
-	EClassifier getEType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.SiriusVariable#getEType <em>EType</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EType</em>' reference.
-	 * @see #getEType()
-	 * @generated
-	 */
-	void setEType(EClassifier value);
-
-} // SiriusVariable
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/UserDefinedVariable.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/UserDefinedVariable.java
deleted file mode 100644
index cad0af1f88..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/UserDefinedVariable.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>User Defined Variable</b></em>'. <!--
- * end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.UserDefinedVariable#getValueExpression <em>Value Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.expression.ExpressionPackage#getUserDefinedVariable()
- * @model
- * @generated
- */
-public interface UserDefinedVariable extends SiriusVariable {
-	/**
-	 * Returns the value of the '<em><b>Value Expression</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Expression</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value Expression</em>' attribute.
-	 * @see #setValueExpression(String)
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#getUserDefinedVariable_ValueExpression()
-	 * @model dataType="org.eclipse.sirius.expression.Expression"
-	 * @generated
-	 */
-	String getValueExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.sirius.expression.UserDefinedVariable#getValueExpression <em>Value Expression</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Expression</em>' attribute.
-	 * @see #getValueExpression()
-	 * @generated
-	 */
-	void setValueExpression(String value);
-
-} // UserDefinedVariable
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/ExpressionFactoryImpl.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/ExpressionFactoryImpl.java
deleted file mode 100644
index 86bf977f9a..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/ExpressionFactoryImpl.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.sirius.expression.ExpressionFactory;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionClass;
-import org.eclipse.sirius.expression.SiriusExpressionDescription;
-import org.eclipse.sirius.expression.SiriusExpressionPackage;
-import org.eclipse.sirius.expression.SiriusParameter;
-import org.eclipse.sirius.expression.SiriusVariable;
-import org.eclipse.sirius.expression.UserDefinedVariable;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * @generated
- */
-public class ExpressionFactoryImpl extends EFactoryImpl implements ExpressionFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ExpressionFactory init() {
-		try {
-			ExpressionFactory theExpressionFactory = (ExpressionFactory)EPackage.Registry.INSTANCE.getEFactory(ExpressionPackage.eNS_URI);
-			if (theExpressionFactory != null) {
-				return theExpressionFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ExpressionFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE: return createSiriusExpressionPackage();
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION: return createSiriusExpressionDescription();
-			case ExpressionPackage.SIRIUS_VARIABLE: return createSiriusVariable();
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS: return createSiriusExpressionClass();
-			case ExpressionPackage.SIRIUS_PARAMETER: return createSiriusParameter();
-			case ExpressionPackage.USER_DEFINED_VARIABLE: return createUserDefinedVariable();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case ExpressionPackage.VOID:
-				return createVoidFromString(eDataType, initialValue);
-			case ExpressionPackage.OBJECT:
-				return createObjectFromString(eDataType, initialValue);
-			case ExpressionPackage.PREDICATE:
-				return createPredicateFromString(eDataType, initialValue);
-			case ExpressionPackage.EXPRESSION:
-				return createExpressionFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case ExpressionPackage.VOID:
-				return convertVoidToString(eDataType, instanceValue);
-			case ExpressionPackage.OBJECT:
-				return convertObjectToString(eDataType, instanceValue);
-			case ExpressionPackage.PREDICATE:
-				return convertPredicateToString(eDataType, instanceValue);
-			case ExpressionPackage.EXPRESSION:
-				return convertExpressionToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SiriusExpressionPackage createSiriusExpressionPackage() {
-		SiriusExpressionPackageImpl siriusExpressionPackage = new SiriusExpressionPackageImpl();
-		return siriusExpressionPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SiriusExpressionDescription createSiriusExpressionDescription() {
-		SiriusExpressionDescriptionImpl siriusExpressionDescription = new SiriusExpressionDescriptionImpl();
-		return siriusExpressionDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SiriusVariable createSiriusVariable() {
-		SiriusVariableImpl siriusVariable = new SiriusVariableImpl();
-		return siriusVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SiriusExpressionClass createSiriusExpressionClass() {
-		SiriusExpressionClassImpl siriusExpressionClass = new SiriusExpressionClassImpl();
-		return siriusExpressionClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SiriusParameter createSiriusParameter() {
-		SiriusParameterImpl siriusParameter = new SiriusParameterImpl();
-		return siriusParameter;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UserDefinedVariable createUserDefinedVariable() {
-		UserDefinedVariableImpl userDefinedVariable = new UserDefinedVariableImpl();
-		return userDefinedVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Void createVoidFromString(EDataType eDataType, String initialValue) {
-		return (Void)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertVoidToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createObjectFromString(EDataType eDataType, String initialValue) {
-		return super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertObjectToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createPredicateFromString(EDataType eDataType, String initialValue) {
-		return super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertPredicateToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createExpressionFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertExpressionToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionPackage getExpressionPackage() {
-		return (ExpressionPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ExpressionPackage getPackage() {
-		return ExpressionPackage.eINSTANCE;
-	}
-
-} // ExpressionFactoryImpl
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/ExpressionPackageImpl.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/ExpressionPackageImpl.java
deleted file mode 100644
index 5c93f24a35..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/ExpressionPackageImpl.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.sirius.expression.ExpressionFactory;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionClass;
-import org.eclipse.sirius.expression.SiriusExpressionDescription;
-import org.eclipse.sirius.expression.SiriusExpressionPackage;
-import org.eclipse.sirius.expression.SiriusParameter;
-import org.eclipse.sirius.expression.SiriusVariable;
-import org.eclipse.sirius.expression.UserDefinedVariable;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * @generated
- */
-public class ExpressionPackageImpl extends EPackageImpl implements ExpressionPackage {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass siriusExpressionPackageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass siriusExpressionDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass siriusVariableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass siriusExpressionClassEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass siriusParameterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass userDefinedVariableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType voidEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType objectEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType predicateEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType expressionEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
-	 * EPackage.Registry} by the package package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
-	 * performs initialization of the package, or returns the registered package, if one already exists. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.sirius.expression.ExpressionPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ExpressionPackageImpl() {
-		super(eNS_URI, ExpressionFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link ExpressionPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ExpressionPackage init() {
-		if (isInited) return (ExpressionPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ExpressionPackageImpl theExpressionPackage = (ExpressionPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExpressionPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ExpressionPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theExpressionPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theExpressionPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theExpressionPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ExpressionPackage.eNS_URI, theExpressionPackage);
-		return theExpressionPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSiriusExpressionPackage() {
-		return siriusExpressionPackageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionPackage_ExpressionClasses() {
-		return (EReference)siriusExpressionPackageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionPackage_EPackage() {
-		return (EReference)siriusExpressionPackageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSiriusExpressionDescription() {
-		return siriusExpressionDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSiriusExpressionDescription_LowerBound() {
-		return (EAttribute)siriusExpressionDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSiriusExpressionDescription_UpperBound() {
-		return (EAttribute)siriusExpressionDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionDescription_Expression() {
-		return (EReference)siriusExpressionDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionDescription_Parameters() {
-		return (EReference)siriusExpressionDescriptionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionDescription_ReturnType() {
-		return (EReference)siriusExpressionDescriptionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionDescription_VariableContainers() {
-		return (EReference)siriusExpressionDescriptionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSiriusVariable() {
-		return siriusVariableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSiriusVariable_Name() {
-		return (EAttribute)siriusVariableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSiriusVariable_Documentation() {
-		return (EAttribute)siriusVariableEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusVariable_EType() {
-		return (EReference)siriusVariableEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSiriusExpressionClass() {
-		return siriusExpressionClassEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionClass_Variables() {
-		return (EReference)siriusExpressionClassEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionClass_ExpressionDescriptions() {
-		return (EReference)siriusExpressionClassEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusExpressionClass_EClass() {
-		return (EReference)siriusExpressionClassEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSiriusParameter() {
-		return siriusParameterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSiriusParameter_Optional() {
-		return (EAttribute)siriusParameterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSiriusParameter_Variable() {
-		return (EReference)siriusParameterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUserDefinedVariable() {
-		return userDefinedVariableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUserDefinedVariable_ValueExpression() {
-		return (EAttribute)userDefinedVariableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getVoid() {
-		return voidEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getObject() {
-		return objectEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getPredicate() {
-		return predicateEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getExpression() {
-		return expressionEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionFactory getExpressionFactory() {
-		return (ExpressionFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		siriusExpressionPackageEClass = createEClass(SIRIUS_EXPRESSION_PACKAGE);
-		createEReference(siriusExpressionPackageEClass, SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES);
-		createEReference(siriusExpressionPackageEClass, SIRIUS_EXPRESSION_PACKAGE__EPACKAGE);
-
-		siriusExpressionDescriptionEClass = createEClass(SIRIUS_EXPRESSION_DESCRIPTION);
-		createEAttribute(siriusExpressionDescriptionEClass, SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND);
-		createEAttribute(siriusExpressionDescriptionEClass, SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND);
-		createEReference(siriusExpressionDescriptionEClass, SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION);
-		createEReference(siriusExpressionDescriptionEClass, SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS);
-		createEReference(siriusExpressionDescriptionEClass, SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE);
-		createEReference(siriusExpressionDescriptionEClass, SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS);
-
-		siriusVariableEClass = createEClass(SIRIUS_VARIABLE);
-		createEAttribute(siriusVariableEClass, SIRIUS_VARIABLE__NAME);
-		createEAttribute(siriusVariableEClass, SIRIUS_VARIABLE__DOCUMENTATION);
-		createEReference(siriusVariableEClass, SIRIUS_VARIABLE__ETYPE);
-
-		siriusExpressionClassEClass = createEClass(SIRIUS_EXPRESSION_CLASS);
-		createEReference(siriusExpressionClassEClass, SIRIUS_EXPRESSION_CLASS__VARIABLES);
-		createEReference(siriusExpressionClassEClass, SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS);
-		createEReference(siriusExpressionClassEClass, SIRIUS_EXPRESSION_CLASS__ECLASS);
-
-		siriusParameterEClass = createEClass(SIRIUS_PARAMETER);
-		createEAttribute(siriusParameterEClass, SIRIUS_PARAMETER__OPTIONAL);
-		createEReference(siriusParameterEClass, SIRIUS_PARAMETER__VARIABLE);
-
-		userDefinedVariableEClass = createEClass(USER_DEFINED_VARIABLE);
-		createEAttribute(userDefinedVariableEClass, USER_DEFINED_VARIABLE__VALUE_EXPRESSION);
-
-		// Create data types
-		voidEDataType = createEDataType(VOID);
-		objectEDataType = createEDataType(OBJECT);
-		predicateEDataType = createEDataType(PREDICATE);
-		expressionEDataType = createEDataType(EXPRESSION);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		userDefinedVariableEClass.getESuperTypes().add(this.getSiriusVariable());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(siriusExpressionPackageEClass, SiriusExpressionPackage.class, "SiriusExpressionPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getSiriusExpressionPackage_ExpressionClasses(), this.getSiriusExpressionClass(), null, "expressionClasses", null, 0, -1, SiriusExpressionPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSiriusExpressionPackage_EPackage(), theEcorePackage.getEPackage(), null, "ePackage", null, 0, 1, SiriusExpressionPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(siriusExpressionDescriptionEClass, SiriusExpressionDescription.class, "SiriusExpressionDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getSiriusExpressionDescription_LowerBound(), ecorePackage.getEInt(), "lowerBound", null, 0, 1, SiriusExpressionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSiriusExpressionDescription_UpperBound(), ecorePackage.getEInt(), "upperBound", "1", 0, 1, SiriusExpressionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getSiriusExpressionDescription_Expression(), theEcorePackage.getEStructuralFeature(), null, "expression", null, 0, 1, SiriusExpressionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSiriusExpressionDescription_Parameters(), this.getSiriusParameter(), null, "parameters", null, 0, -1, SiriusExpressionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSiriusExpressionDescription_ReturnType(), theEcorePackage.getEClassifier(), null, "returnType", null, 0, 1, SiriusExpressionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSiriusExpressionDescription_VariableContainers(), theEcorePackage.getEClass(), null, "variableContainers", null, 0, -1, SiriusExpressionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(siriusVariableEClass, SiriusVariable.class, "SiriusVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getSiriusVariable_Name(), ecorePackage.getEString(), "name", null, 0, 1, SiriusVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getSiriusVariable_Documentation(), ecorePackage.getEString(), "documentation", null, 0, 1, SiriusVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSiriusVariable_EType(), theEcorePackage.getEClassifier(), null, "eType", null, 0, 1, SiriusVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(siriusExpressionClassEClass, SiriusExpressionClass.class, "SiriusExpressionClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getSiriusExpressionClass_Variables(), this.getSiriusVariable(), null, "variables", null, 0, -1, SiriusExpressionClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSiriusExpressionClass_ExpressionDescriptions(), this.getSiriusExpressionDescription(), null, "expressionDescriptions", null, 0, -1, SiriusExpressionClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSiriusExpressionClass_EClass(), theEcorePackage.getEClass(), null, "eClass", null, 0, 1, SiriusExpressionClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(siriusParameterEClass, SiriusParameter.class, "SiriusParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getSiriusParameter_Optional(), ecorePackage.getEBoolean(), "optional", null, 0, 1, SiriusParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getSiriusParameter_Variable(), this.getSiriusVariable(), null, "variable", null, 0, 1, SiriusParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(userDefinedVariableEClass, UserDefinedVariable.class, "UserDefinedVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getUserDefinedVariable_ValueExpression(), this.getExpression(), "valueExpression", null, 0, 1, UserDefinedVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		// Initialize data types
-		initEDataType(voidEDataType, Void.class, "Void", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(objectEDataType, Object.class, "Object", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(predicateEDataType, Object.class, "Predicate", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEDataType(expressionEDataType, String.class, "Expression", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} // ExpressionPackageImpl
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionClassImpl.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionClassImpl.java
deleted file mode 100644
index 770b537c8d..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionClassImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionClass;
-import org.eclipse.sirius.expression.SiriusExpressionDescription;
-import org.eclipse.sirius.expression.SiriusVariable;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sirius Expression Class</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionClassImpl#getVariables <em>Variables</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionClassImpl#getExpressionDescriptions <em>Expression Descriptions</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionClassImpl#getEClass <em>EClass</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SiriusExpressionClassImpl extends MinimalEObjectImpl.Container implements SiriusExpressionClass {
-	/**
-	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getVariables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SiriusVariable> variables;
-
-	/**
-	 * The cached value of the '{@link #getExpressionDescriptions() <em>Expression Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getExpressionDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SiriusExpressionDescription> expressionDescriptions;
-
-	/**
-	 * The cached value of the '{@link #getEClass() <em>EClass</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getEClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClass eClass;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SiriusExpressionClassImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionPackage.Literals.SIRIUS_EXPRESSION_CLASS;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<SiriusVariable> getVariables() {
-		if (variables == null) {
-			variables = new EObjectContainmentEList.Resolving<SiriusVariable>(SiriusVariable.class, this, ExpressionPackage.SIRIUS_EXPRESSION_CLASS__VARIABLES);
-		}
-		return variables;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<SiriusExpressionDescription> getExpressionDescriptions() {
-		if (expressionDescriptions == null) {
-			expressionDescriptions = new EObjectContainmentEList.Resolving<SiriusExpressionDescription>(SiriusExpressionDescription.class, this, ExpressionPackage.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS);
-		}
-		return expressionDescriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEClass() {
-		if (eClass != null && eClass.eIsProxy()) {
-			InternalEObject oldEClass = (InternalEObject)eClass;
-			eClass = (EClass)eResolveProxy(oldEClass);
-			if (eClass != oldEClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionPackage.SIRIUS_EXPRESSION_CLASS__ECLASS, oldEClass, eClass));
-			}
-		}
-		return eClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass basicGetEClass() {
-		return eClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEClass(EClass newEClass) {
-		EClass oldEClass = eClass;
-		eClass = newEClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_EXPRESSION_CLASS__ECLASS, oldEClass, eClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__VARIABLES:
-				return ((InternalEList<?>)getVariables()).basicRemove(otherEnd, msgs);
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS:
-				return ((InternalEList<?>)getExpressionDescriptions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__VARIABLES:
-				return getVariables();
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS:
-				return getExpressionDescriptions();
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__ECLASS:
-				if (resolve) return getEClass();
-				return basicGetEClass();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__VARIABLES:
-				getVariables().clear();
-				getVariables().addAll((Collection<? extends SiriusVariable>)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS:
-				getExpressionDescriptions().clear();
-				getExpressionDescriptions().addAll((Collection<? extends SiriusExpressionDescription>)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__ECLASS:
-				setEClass((EClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__VARIABLES:
-				getVariables().clear();
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS:
-				getExpressionDescriptions().clear();
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__ECLASS:
-				setEClass((EClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__VARIABLES:
-				return variables != null && !variables.isEmpty();
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__EXPRESSION_DESCRIPTIONS:
-				return expressionDescriptions != null && !expressionDescriptions.isEmpty();
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS__ECLASS:
-				return eClass != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // SiriusExpressionClassImpl
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionDescriptionImpl.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionDescriptionImpl.java
deleted file mode 100644
index 9737efd339..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionDescriptionImpl.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionDescription;
-import org.eclipse.sirius.expression.SiriusParameter;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sirius Expression Description</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl#getLowerBound <em>Lower Bound</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl#getUpperBound <em>Upper Bound</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl#getReturnType <em>Return Type</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionDescriptionImpl#getVariableContainers <em>Variable Containers</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SiriusExpressionDescriptionImpl extends MinimalEObjectImpl.Container implements SiriusExpressionDescription {
-	/**
-	 * The default value of the '{@link #getLowerBound() <em>Lower Bound</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getLowerBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int LOWER_BOUND_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getLowerBound() <em>Lower Bound</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getLowerBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected int lowerBound = LOWER_BOUND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUpperBound() <em>Upper Bound</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getUpperBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int UPPER_BOUND_EDEFAULT = 1;
-
-	/**
-	 * The cached value of the '{@link #getUpperBound() <em>Upper Bound</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getUpperBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected int upperBound = UPPER_BOUND_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature expression;
-
-	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getParameters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SiriusParameter> parameters;
-
-	/**
-	 * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getReturnType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClassifier returnType;
-
-	/**
-	 * The cached value of the '{@link #getVariableContainers() <em>Variable Containers</em>}' reference list. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getVariableContainers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EClass> variableContainers;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SiriusExpressionDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionPackage.Literals.SIRIUS_EXPRESSION_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getLowerBound() {
-		return lowerBound;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLowerBound(int newLowerBound) {
-		int oldLowerBound = lowerBound;
-		lowerBound = newLowerBound;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND, oldLowerBound, lowerBound));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getUpperBound() {
-		return upperBound;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUpperBound(int newUpperBound) {
-		int oldUpperBound = upperBound;
-		upperBound = newUpperBound;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND, oldUpperBound, upperBound));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (EStructuralFeature)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION, oldExpression, expression));
-			}
-		}
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature basicGetExpression() {
-		return expression;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpression(EStructuralFeature newExpression) {
-		EStructuralFeature oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION, oldExpression, expression));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<SiriusParameter> getParameters() {
-		if (parameters == null) {
-			parameters = new EObjectContainmentEList.Resolving<SiriusParameter>(SiriusParameter.class, this, ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS);
-		}
-		return parameters;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClassifier getReturnType() {
-		if (returnType != null && returnType.eIsProxy()) {
-			InternalEObject oldReturnType = (InternalEObject)returnType;
-			returnType = (EClassifier)eResolveProxy(oldReturnType);
-			if (returnType != oldReturnType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE, oldReturnType, returnType));
-			}
-		}
-		return returnType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClassifier basicGetReturnType() {
-		return returnType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReturnType(EClassifier newReturnType) {
-		EClassifier oldReturnType = returnType;
-		returnType = newReturnType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE, oldReturnType, returnType));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<EClass> getVariableContainers() {
-		if (variableContainers == null) {
-			variableContainers = new EObjectResolvingEList<EClass>(EClass.class, this, ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS);
-		}
-		return variableContainers;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS:
-				return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND:
-				return getLowerBound();
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND:
-				return getUpperBound();
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS:
-				return getParameters();
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE:
-				if (resolve) return getReturnType();
-				return basicGetReturnType();
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS:
-				return getVariableContainers();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND:
-				setLowerBound((Integer)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND:
-				setUpperBound((Integer)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION:
-				setExpression((EStructuralFeature)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS:
-				getParameters().clear();
-				getParameters().addAll((Collection<? extends SiriusParameter>)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE:
-				setReturnType((EClassifier)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS:
-				getVariableContainers().clear();
-				getVariableContainers().addAll((Collection<? extends EClass>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION:
-				setExpression((EStructuralFeature)null);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS:
-				getParameters().clear();
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE:
-				setReturnType((EClassifier)null);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS:
-				getVariableContainers().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__EXPRESSION:
-				return expression != null;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__PARAMETERS:
-				return parameters != null && !parameters.isEmpty();
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__RETURN_TYPE:
-				return returnType != null;
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION__VARIABLE_CONTAINERS:
-				return variableContainers != null && !variableContainers.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (lowerBound: "); //$NON-NLS-1$
-		result.append(lowerBound);
-		result.append(", upperBound: "); //$NON-NLS-1$
-		result.append(upperBound);
-		result.append(')');
-		return result.toString();
-	}
-
-} // SiriusExpressionDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionPackageImpl.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionPackageImpl.java
deleted file mode 100644
index 940df9d1fc..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusExpressionPackageImpl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionClass;
-import org.eclipse.sirius.expression.SiriusExpressionPackage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sirius Expression Package</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionPackageImpl#getExpressionClasses <em>Expression Classes</em>}</li>
- *   <li>{@link org.eclipse.sirius.expression.impl.SiriusExpressionPackageImpl#getEPackage <em>EPackage</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SiriusExpressionPackageImpl extends MinimalEObjectImpl.Container implements SiriusExpressionPackage {
-	/**
-	 * The cached value of the '{@link #getExpressionClasses() <em>Expression Classes</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #getExpressionClasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SiriusExpressionClass> expressionClasses;
-
-	/**
-	 * The cached value of the '{@link #getEPackage() <em>EPackage</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getEPackage()
-	 * @generated
-	 * @ordered
-	 */
-	protected EPackage ePackage;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SiriusExpressionPackageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionPackage.Literals.SIRIUS_EXPRESSION_PACKAGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<SiriusExpressionClass> getExpressionClasses() {
-		if (expressionClasses == null) {
-			expressionClasses = new EObjectContainmentEList.Resolving<SiriusExpressionClass>(SiriusExpressionClass.class, this, ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES);
-		}
-		return expressionClasses;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EPackage getEPackage() {
-		if (ePackage != null && ePackage.eIsProxy()) {
-			InternalEObject oldEPackage = (InternalEObject)ePackage;
-			ePackage = (EPackage)eResolveProxy(oldEPackage);
-			if (ePackage != oldEPackage) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EPACKAGE, oldEPackage, ePackage));
-			}
-		}
-		return ePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EPackage basicGetEPackage() {
-		return ePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEPackage(EPackage newEPackage) {
-		EPackage oldEPackage = ePackage;
-		ePackage = newEPackage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EPACKAGE, oldEPackage, ePackage));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES:
-				return ((InternalEList<?>)getExpressionClasses()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES:
-				return getExpressionClasses();
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EPACKAGE:
-				if (resolve) return getEPackage();
-				return basicGetEPackage();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES:
-				getExpressionClasses().clear();
-				getExpressionClasses().addAll((Collection<? extends SiriusExpressionClass>)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EPACKAGE:
-				setEPackage((EPackage)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES:
-				getExpressionClasses().clear();
-				return;
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EPACKAGE:
-				setEPackage((EPackage)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EXPRESSION_CLASSES:
-				return expressionClasses != null && !expressionClasses.isEmpty();
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE__EPACKAGE:
-				return ePackage != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // SiriusExpressionPackageImpl
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusParameterImpl.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusParameterImpl.java
deleted file mode 100644
index 4b710f86fa..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusParameterImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusParameter;
-import org.eclipse.sirius.expression.SiriusVariable;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sirius Parameter</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.sirius.expression.impl.SiriusParameterImpl#isOptional <em>Optional</em>}</li>
- * <li>{@link org.eclipse.sirius.expression.impl.SiriusParameterImpl#getVariable <em>Variable</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SiriusParameterImpl extends MinimalEObjectImpl.Container implements SiriusParameter {
-	/**
-	 * The default value of the '{@link #isOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #isOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean OPTIONAL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #isOptional()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean optional = OPTIONAL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getVariable() <em>Variable</em>}' reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #getVariable()
-	 * @generated
-	 * @ordered
-	 */
-	protected SiriusVariable variable;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SiriusParameterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionPackage.Literals.SIRIUS_PARAMETER;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isOptional() {
-		return optional;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOptional(boolean newOptional) {
-		boolean oldOptional = optional;
-		optional = newOptional;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_PARAMETER__OPTIONAL, oldOptional, optional));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SiriusVariable getVariable() {
-		if (variable != null && variable.eIsProxy()) {
-			InternalEObject oldVariable = (InternalEObject)variable;
-			variable = (SiriusVariable)eResolveProxy(oldVariable);
-			if (variable != oldVariable) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionPackage.SIRIUS_PARAMETER__VARIABLE, oldVariable, variable));
-			}
-		}
-		return variable;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SiriusVariable basicGetVariable() {
-		return variable;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVariable(SiriusVariable newVariable) {
-		SiriusVariable oldVariable = variable;
-		variable = newVariable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_PARAMETER__VARIABLE, oldVariable, variable));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_PARAMETER__OPTIONAL:
-				return isOptional();
-			case ExpressionPackage.SIRIUS_PARAMETER__VARIABLE:
-				if (resolve) return getVariable();
-				return basicGetVariable();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_PARAMETER__OPTIONAL:
-				setOptional((Boolean)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_PARAMETER__VARIABLE:
-				setVariable((SiriusVariable)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_PARAMETER__OPTIONAL:
-				setOptional(OPTIONAL_EDEFAULT);
-				return;
-			case ExpressionPackage.SIRIUS_PARAMETER__VARIABLE:
-				setVariable((SiriusVariable)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_PARAMETER__OPTIONAL:
-				return optional != OPTIONAL_EDEFAULT;
-			case ExpressionPackage.SIRIUS_PARAMETER__VARIABLE:
-				return variable != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (optional: "); //$NON-NLS-1$
-		result.append(optional);
-		result.append(')');
-		return result.toString();
-	}
-
-} // SiriusParameterImpl
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusVariableImpl.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusVariableImpl.java
deleted file mode 100644
index 9d71955f96..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/SiriusVariableImpl.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusVariable;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sirius Variable</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.sirius.expression.impl.SiriusVariableImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.sirius.expression.impl.SiriusVariableImpl#getDocumentation <em>Documentation</em>}</li>
- * <li>{@link org.eclipse.sirius.expression.impl.SiriusVariableImpl#getEType <em>EType</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SiriusVariableImpl extends MinimalEObjectImpl.Container implements SiriusVariable {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDocumentation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DOCUMENTATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDocumentation()
-	 * @generated
-	 * @ordered
-	 */
-	protected String documentation = DOCUMENTATION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEType() <em>EType</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @see #getEType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClassifier eType;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SiriusVariableImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionPackage.Literals.SIRIUS_VARIABLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_VARIABLE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDocumentation() {
-		return documentation;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDocumentation(String newDocumentation) {
-		String oldDocumentation = documentation;
-		documentation = newDocumentation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_VARIABLE__DOCUMENTATION, oldDocumentation, documentation));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClassifier getEType() {
-		if (eType != null && eType.eIsProxy()) {
-			InternalEObject oldEType = (InternalEObject)eType;
-			eType = (EClassifier)eResolveProxy(oldEType);
-			if (eType != oldEType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionPackage.SIRIUS_VARIABLE__ETYPE, oldEType, eType));
-			}
-		}
-		return eType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClassifier basicGetEType() {
-		return eType;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEType(EClassifier newEType) {
-		EClassifier oldEType = eType;
-		eType = newEType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SIRIUS_VARIABLE__ETYPE, oldEType, eType));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_VARIABLE__NAME:
-				return getName();
-			case ExpressionPackage.SIRIUS_VARIABLE__DOCUMENTATION:
-				return getDocumentation();
-			case ExpressionPackage.SIRIUS_VARIABLE__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_VARIABLE__NAME:
-				setName((String)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_VARIABLE__DOCUMENTATION:
-				setDocumentation((String)newValue);
-				return;
-			case ExpressionPackage.SIRIUS_VARIABLE__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_VARIABLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case ExpressionPackage.SIRIUS_VARIABLE__DOCUMENTATION:
-				setDocumentation(DOCUMENTATION_EDEFAULT);
-				return;
-			case ExpressionPackage.SIRIUS_VARIABLE__ETYPE:
-				setEType((EClassifier)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.SIRIUS_VARIABLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case ExpressionPackage.SIRIUS_VARIABLE__DOCUMENTATION:
-				return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
-			case ExpressionPackage.SIRIUS_VARIABLE__ETYPE:
-				return eType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", documentation: "); //$NON-NLS-1$
-		result.append(documentation);
-		result.append(')');
-		return result.toString();
-	}
-
-} // SiriusVariableImpl
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/UserDefinedVariableImpl.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/UserDefinedVariableImpl.java
deleted file mode 100644
index 5bcd229c21..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/impl/UserDefinedVariableImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.UserDefinedVariable;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>User Defined Variable</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.sirius.expression.impl.UserDefinedVariableImpl#getValueExpression <em>Value Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UserDefinedVariableImpl extends SiriusVariableImpl implements UserDefinedVariable {
-	/**
-	 * The default value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @see #getValueExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EXPRESSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @see #getValueExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UserDefinedVariableImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExpressionPackage.Literals.USER_DEFINED_VARIABLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValueExpression() {
-		return valueExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueExpression(String newValueExpression) {
-		String oldValueExpression = valueExpression;
-		valueExpression = newValueExpression;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.USER_DEFINED_VARIABLE__VALUE_EXPRESSION, oldValueExpression, valueExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ExpressionPackage.USER_DEFINED_VARIABLE__VALUE_EXPRESSION:
-				return getValueExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ExpressionPackage.USER_DEFINED_VARIABLE__VALUE_EXPRESSION:
-				setValueExpression((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.USER_DEFINED_VARIABLE__VALUE_EXPRESSION:
-				setValueExpression(VALUE_EXPRESSION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ExpressionPackage.USER_DEFINED_VARIABLE__VALUE_EXPRESSION:
-				return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (valueExpression: "); //$NON-NLS-1$
-		result.append(valueExpression);
-		result.append(')');
-		return result.toString();
-	}
-
-} // UserDefinedVariableImpl
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/util/ExpressionAdapterFactory.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/util/ExpressionAdapterFactory.java
deleted file mode 100644
index 1f7f0dd639..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/util/ExpressionAdapterFactory.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionClass;
-import org.eclipse.sirius.expression.SiriusExpressionDescription;
-import org.eclipse.sirius.expression.SiriusExpressionPackage;
-import org.eclipse.sirius.expression.SiriusParameter;
-import org.eclipse.sirius.expression.SiriusVariable;
-import org.eclipse.sirius.expression.UserDefinedVariable;
-
-/**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
- * method for each class of the model. <!-- end-user-doc -->
- * @see org.eclipse.sirius.expression.ExpressionPackage
- * @generated
- */
-public class ExpressionAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ExpressionPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ExpressionPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc --> This
-	 * implementation returns <code>true</code> if the object is either the model's package or is an instance object of
-	 * the model. <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExpressionSwitch<Adapter> modelSwitch = new ExpressionSwitch<Adapter>() {
-			@Override
-			public Adapter caseSiriusExpressionPackage(SiriusExpressionPackage object) {
-				return createSiriusExpressionPackageAdapter();
-			}
-			@Override
-			public Adapter caseSiriusExpressionDescription(SiriusExpressionDescription object) {
-				return createSiriusExpressionDescriptionAdapter();
-			}
-			@Override
-			public Adapter caseSiriusVariable(SiriusVariable object) {
-				return createSiriusVariableAdapter();
-			}
-			@Override
-			public Adapter caseSiriusExpressionClass(SiriusExpressionClass object) {
-				return createSiriusExpressionClassAdapter();
-			}
-			@Override
-			public Adapter caseSiriusParameter(SiriusParameter object) {
-				return createSiriusParameterAdapter();
-			}
-			@Override
-			public Adapter caseUserDefinedVariable(UserDefinedVariable object) {
-				return createUserDefinedVariableAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.sirius.expression.SiriusExpressionPackage <em>Sirius Expression Package</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so that we
-	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-	 * end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionPackage
-	 * @generated
-	 */
-	public Adapter createSiriusExpressionPackageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.sirius.expression.SiriusExpressionDescription <em>Sirius Expression Description</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so
-	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionDescription
-	 * @generated
-	 */
-	public Adapter createSiriusExpressionDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.sirius.expression.SiriusVariable <em>Sirius Variable</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so that we can
-	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-	 * end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.sirius.expression.SiriusVariable
-	 * @generated
-	 */
-	public Adapter createSiriusVariableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.sirius.expression.SiriusExpressionClass <em>Sirius Expression Class</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so that we
-	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-	 * end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.sirius.expression.SiriusExpressionClass
-	 * @generated
-	 */
-	public Adapter createSiriusExpressionClassAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.sirius.expression.SiriusParameter <em>Sirius Parameter</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so that we can
-	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-	 * end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.sirius.expression.SiriusParameter
-	 * @generated
-	 */
-	public Adapter createSiriusParameterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.sirius.expression.UserDefinedVariable <em>User Defined Variable</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so that we can
-	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-	 * end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.sirius.expression.UserDefinedVariable
-	 * @generated
-	 */
-	public Adapter createUserDefinedVariableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc --> This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // ExpressionAdapterFactory
diff --git a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/util/ExpressionSwitch.java b/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/util/ExpressionSwitch.java
deleted file mode 100644
index ceacfb8c75..0000000000
--- a/incubation/org.eclipse.sirius.expression/src-gen/org/eclipse/sirius/expression/util/ExpressionSwitch.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.htm
- */
-package org.eclipse.sirius.expression.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.expression.SiriusExpressionClass;
-import org.eclipse.sirius.expression.SiriusExpressionDescription;
-import org.eclipse.sirius.expression.SiriusExpressionPackage;
-import org.eclipse.sirius.expression.SiriusParameter;
-import org.eclipse.sirius.expression.SiriusVariable;
-import org.eclipse.sirius.expression.UserDefinedVariable;
-
-/**
- * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
- * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
- * returned, which is the result of the switch. <!-- end-user-doc -->
- * @see org.eclipse.sirius.expression.ExpressionPackage
- * @generated
- */
-public class ExpressionSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ExpressionPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ExpressionPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ExpressionPackage.SIRIUS_EXPRESSION_PACKAGE: {
-				SiriusExpressionPackage siriusExpressionPackage = (SiriusExpressionPackage)theEObject;
-				T result = caseSiriusExpressionPackage(siriusExpressionPackage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionPackage.SIRIUS_EXPRESSION_DESCRIPTION: {
-				SiriusExpressionDescription siriusExpressionDescription = (SiriusExpressionDescription)theEObject;
-				T result = caseSiriusExpressionDescription(siriusExpressionDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionPackage.SIRIUS_VARIABLE: {
-				SiriusVariable siriusVariable = (SiriusVariable)theEObject;
-				T result = caseSiriusVariable(siriusVariable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionPackage.SIRIUS_EXPRESSION_CLASS: {
-				SiriusExpressionClass siriusExpressionClass = (SiriusExpressionClass)theEObject;
-				T result = caseSiriusExpressionClass(siriusExpressionClass);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionPackage.SIRIUS_PARAMETER: {
-				SiriusParameter siriusParameter = (SiriusParameter)theEObject;
-				T result = caseSiriusParameter(siriusParameter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ExpressionPackage.USER_DEFINED_VARIABLE: {
-				UserDefinedVariable userDefinedVariable = (UserDefinedVariable)theEObject;
-				T result = caseUserDefinedVariable(userDefinedVariable);
-				if (result == null) result = caseSiriusVariable(userDefinedVariable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sirius Expression Package</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sirius Expression Package</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSiriusExpressionPackage(SiriusExpressionPackage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sirius Expression Description</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sirius Expression Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSiriusExpressionDescription(SiriusExpressionDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sirius Variable</em>'. <!-- begin-user-doc
-	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
-	 * -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sirius Variable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSiriusVariable(SiriusVariable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sirius Expression Class</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sirius Expression Class</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSiriusExpressionClass(SiriusExpressionClass object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sirius Parameter</em>'. <!-- begin-user-doc
-	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
-	 * -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sirius Parameter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSiriusParameter(SiriusParameter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>User Defined Variable</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>User Defined Variable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseUserDefinedVariable(UserDefinedVariable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc --> This
-	 * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
-	 * anyway. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // ExpressionSwitch
diff --git a/incubation/org.eclipse.sirius.properties.edit/META-INF/MANIFEST.MF b/incubation/org.eclipse.sirius.properties.edit/META-INF/MANIFEST.MF
index 7a27ca3806..6481afc76d 100644
--- a/incubation/org.eclipse.sirius.properties.edit/META-INF/MANIFEST.MF
+++ b/incubation/org.eclipse.sirius.properties.edit/META-INF/MANIFEST.MF
@@ -14,8 +14,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.sirius.expression;visibility:=reexport,
- org.eclipse.sirius.expression.edit;visibility:=reexport,
  org.eclipse.sirius;visibility:=reexport,
  org.eclipse.sirius.ui;visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateCheckboxDescription_initialOperation_InitialOperation.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateCheckboxDescription_initialOperation_InitialOperation.gif
deleted file mode 100644
index 448138d708..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateCheckboxDescription_initialOperation_InitialOperation.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_CheckboxDescription.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_CheckboxDescription.gif
deleted file mode 100644
index 45bc7b7b67..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_CheckboxDescription.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_SelectDescription.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_SelectDescription.gif
deleted file mode 100644
index 6560457c10..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_SelectDescription.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateSelectDescription_initialOperation_InitialOperation.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateSelectDescription_initialOperation_InitialOperation.gif
deleted file mode 100644
index 159fb27cec..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateSelectDescription_initialOperation_InitialOperation.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxDescription.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxDescription.gif
deleted file mode 100644
index 739ebbfa6a..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxDescription.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/PropertyContextVariable.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/PropertyContextVariable.gif
deleted file mode 100644
index c00aedf413..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/PropertyContextVariable.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectDescription.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectDescription.gif
deleted file mode 100644
index 9250fecbff..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectDescription.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.properties.edit/plugin.properties b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
index 6f7bee4be9..7098fc2862 100644
--- a/incubation/org.eclipse.sirius.properties.edit/plugin.properties
+++ b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
@@ -9,34 +9,26 @@
 # 
 
 pluginName = Properties Edit Support
-providerName = www.example.org
-
+providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
 _UI_CreateChild_text3 = {1}
 _UI_CreateChild_tooltip = Create New {0} Under {1} Feature
 _UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
 _UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
 _UI_PropertyDescriptor_description = The {0} of the {1}
-
 _UI_ViewExtensionDescription_type = View Extension Description
 _UI_PageDescription_type = Page Description
 _UI_GroupDescription_type = Group Description
 _UI_ContainerDescription_type = Container Description
 _UI_WidgetDescription_type = Widget Description
 _UI_TextDescription_type = Text Description
-_UI_CheckboxDescription_type = Checkbox Description
-_UI_SelectDescription_type = Select Description
 _UI_Unknown_type = Object
-
 _UI_Unknown_datatype= Value
-
 _UI_ViewExtensionDescription_identifier_feature = Identifier
 _UI_ViewExtensionDescription_metamodels_feature = Metamodels
 _UI_ViewExtensionDescription_pages_feature = Pages
 _UI_ViewExtensionDescription_defaultPage_feature = Default Page
-_UI_ViewExtensionDescription_preconditionExpression_feature = Precondition Expression
 _UI_ViewExtensionDescription_labelExpression_feature = Label Expression
 _UI_ViewExtensionDescription_groups_feature = Groups
 _UI_PageDescription_identifier_feature = Identifier
@@ -55,20 +47,4 @@ _UI_WidgetDescription_identifier_feature = Identifier
 _UI_WidgetDescription_labelExpression_feature = Label Expression
 _UI_TextDescription_valueExpression_feature = Value Expression
 _UI_TextDescription_initialOperation_feature = Initial Operation
-_UI_CheckboxDescription_valueExpression_feature = Value Expression
-_UI_CheckboxDescription_initialOperation_feature = Initial Operation
-_UI_SelectDescription_valueExpression_feature = Value Expression
-_UI_SelectDescription_initialOperation_feature = Initial Operation
-_UI_SelectDescription_multiple_feature = Multiple
-_UI_SelectDescription_candidatesExpression_feature = Candidates Expression
-_UI_SelectDescription_candidateDisplayExpression_feature = Candidate Display Expression
 _UI_Unknown_feature = Unspecified
-
-_UI_WidgetDescription_domainCandidatesExpression_feature = Domain Candidates Expression
-_UI_PropertyContextVariable_type = Property Context Variable
-_UI_PropertyContextVariableContainer_type = Property Context Variable Container
-_UI_PropertyContextVariable_name_feature = Name
-_UI_PropertyContextVariable_propertyContexts_feature = Property Contexts
-_UI_PropertyContextVariableContainer_propertyContextVariables_feature = Property Context Variables
-_UI_PropertyContextVariable_propertyContext_feature = Property Context
-_UI_PropertyContextVariableContainer_preconditionExpression_feature = Precondition Expression
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
deleted file mode 100644
index f7a9259a75..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Obeo - initial API and implementation
- * 
- */
-package org.eclipse.sirius.properties.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.properties.CheckboxDescription;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
-
-/**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.CheckboxDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public CheckboxDescriptionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
-
-    /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addValueExpressionPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
-
-    /**
-     * This adds a property descriptor for the Value Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addValueExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CheckboxDescription_valueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescription_valueExpression_feature", "_UI_CheckboxDescription_type"),
-                PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-    }
-
-    /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION);
-        }
-        return childrenFeatures;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
-        // adding (see {@link AddCommand}) it as a child.
-
-        return super.getChildFeature(object, child);
-    }
-
-    /**
-     * This returns CheckboxDescription.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/CheckboxDescription"));
-    }
-
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((CheckboxDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_CheckboxDescription_type") : getString("_UI_CheckboxDescription_type") + " " + label;
-    }
-
-    /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(CheckboxDescription.class)) {
-        case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        }
-        super.notifyChanged(notification);
-    }
-
-    /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-     * describing the children that can be created under this object. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
-    }
-
-}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
index c47cc6016d..7816d70aa8 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
@@ -11,13 +11,17 @@
  */
 package org.eclipse.sirius.properties.provider;
 
+
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,23 +32,29 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.ContainerDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.properties.ContainerDescription} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
-public class ContainerDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+public class ContainerDescriptionItemProvider 
+    extends ItemProviderAdapter
+    implements
+        IEditingDomainItemProvider,
+        IStructuredItemContentProvider,
+        ITreeItemContentProvider,
+        IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public ContainerDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +62,9 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
     }
 
     /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -68,26 +78,33 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Identifier feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerDescription_identifier_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ContainerDescription_identifier_feature", "_UI_ContainerDescription_type"),
-                PropertiesPackage.Literals.CONTAINER_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_ContainerDescription_identifier_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_ContainerDescription_identifier_feature", "_UI_ContainerDescription_type"),
+                 PropertiesPackage.Literals.CONTAINER_DESCRIPTION__IDENTIFIER,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -100,23 +117,22 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
+        // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
         return super.getChildFeature(object, child);
     }
 
     /**
-     * This returns ContainerDescription.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This returns ContainerDescription.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -125,23 +141,25 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((ContainerDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_ContainerDescription_type") : getString("_UI_ContainerDescription_type") + " " + label;
+        String label = ((ContainerDescription)object).getIdentifier();
+        return label == null || label.length() == 0 ?
+            getString("_UI_ContainerDescription_type") :
+            getString("_UI_ContainerDescription_type") + " " + label;
     }
+    
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -149,38 +167,37 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
         updateChildren(notification);
 
         switch (notification.getFeatureID(ContainerDescription.class)) {
-        case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
+            case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
+            case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+                return;
         }
         super.notifyChanged(notification);
     }
 
     /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-     * describing the children that can be created under this object. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createTextDescription()));
-
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createCheckboxDescription()));
-
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createSelectDescription()));
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS,
+                 PropertiesFactory.eINSTANCE.createTextDescription()));
     }
 
     /**
-     * Return the resource locator for this item provider's resources. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Return the resource locator for this item provider's resources.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
index 9b5f8dfa46..9a06b6879f 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
@@ -11,13 +11,17 @@
  */
 package org.eclipse.sirius.properties.provider;
 
+
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,23 +32,29 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.GroupDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.properties.GroupDescription} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
-public class GroupDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+public class GroupDescriptionItemProvider 
+    extends ItemProviderAdapter
+    implements
+        IEditingDomainItemProvider,
+        IStructuredItemContentProvider,
+        ITreeItemContentProvider,
+        IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public GroupDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +62,9 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -71,63 +81,99 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Identifier feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GroupDescription_identifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_identifier_feature", "_UI_GroupDescription_type"),
-                PropertiesPackage.Literals.GROUP_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_GroupDescription_identifier_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_identifier_feature", "_UI_GroupDescription_type"),
+                 PropertiesPackage.Literals.GROUP_DESCRIPTION__IDENTIFIER,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Label Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Label Expression feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GroupDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"),
-                PropertiesPackage.Literals.GROUP_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_GroupDescription_labelExpression_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"),
+                 PropertiesPackage.Literals.GROUP_DESCRIPTION__LABEL_EXPRESSION,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Domain Class feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Domain Class feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GroupDescription_domainClass_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_domainClass_feature", "_UI_GroupDescription_type"),
-                PropertiesPackage.Literals.GROUP_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_GroupDescription_domainClass_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_domainClass_feature", "_UI_GroupDescription_type"),
+                 PropertiesPackage.Literals.GROUP_DESCRIPTION__DOMAIN_CLASS,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Semantic Candidate Expression
-     * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Semantic Candidate Expression feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addSemanticCandidateExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GroupDescription_semanticCandidateExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_semanticCandidateExpression_feature", "_UI_GroupDescription_type"),
-                PropertiesPackage.Literals.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_GroupDescription_semanticCandidateExpression_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_semanticCandidateExpression_feature", "_UI_GroupDescription_type"),
+                 PropertiesPackage.Literals.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -140,23 +186,22 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
+        // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
         return super.getChildFeature(object, child);
     }
 
     /**
-     * This returns GroupDescription.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This returns GroupDescription.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -165,23 +210,25 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((GroupDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_GroupDescription_type") : getString("_UI_GroupDescription_type") + " " + label;
+        String label = ((GroupDescription)object).getIdentifier();
+        return label == null || label.length() == 0 ?
+            getString("_UI_GroupDescription_type") :
+            getString("_UI_GroupDescription_type") + " " + label;
     }
+    
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -189,37 +236,40 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
         updateChildren(notification);
 
         switch (notification.getFeatureID(GroupDescription.class)) {
-        case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
-        case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
-        case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
-        case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
+            case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
+            case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
+            case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
+            case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
+            case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+                return;
         }
         super.notifyChanged(notification);
     }
 
     /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-     * describing the children that can be created under this object. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTAINER, PropertiesFactory.eINSTANCE.createContainerDescription()));
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTAINER,
+                 PropertiesFactory.eINSTANCE.createContainerDescription()));
     }
 
     /**
-     * Return the resource locator for this item provider's resources. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Return the resource locator for this item provider's resources.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
index 8f96f28faa..c49264b069 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
@@ -11,12 +11,15 @@
  */
 package org.eclipse.sirius.properties.provider;
 
+
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,22 +30,28 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.PageDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.properties.PageDescription} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
-public class PageDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+public class PageDescriptionItemProvider 
+    extends ItemProviderAdapter
+    implements
+        IEditingDomainItemProvider,
+        IStructuredItemContentProvider,
+        ITreeItemContentProvider,
+        IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PageDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -50,9 +59,9 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -70,70 +79,119 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Identifier feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PageDescription_identifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_identifier_feature", "_UI_PageDescription_type"),
-                PropertiesPackage.Literals.PAGE_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_PageDescription_identifier_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_identifier_feature", "_UI_PageDescription_type"),
+                 PropertiesPackage.Literals.PAGE_DESCRIPTION__IDENTIFIER,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Label Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Label Expression feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PageDescription_labelExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_labelExpression_feature", "_UI_PageDescription_type"),
-                PropertiesPackage.Literals.PAGE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_PageDescription_labelExpression_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_labelExpression_feature", "_UI_PageDescription_type"),
+                 PropertiesPackage.Literals.PAGE_DESCRIPTION__LABEL_EXPRESSION,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Domain Class feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Domain Class feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PageDescription_domainClass_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_domainClass_feature", "_UI_PageDescription_type"),
-                PropertiesPackage.Literals.PAGE_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_PageDescription_domainClass_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_domainClass_feature", "_UI_PageDescription_type"),
+                 PropertiesPackage.Literals.PAGE_DESCRIPTION__DOMAIN_CLASS,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Semantic Candidate Expression
-     * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Semantic Candidate Expression feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addSemanticCandidateExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PageDescription_semanticCandidateExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_semanticCandidateExpression_feature", "_UI_PageDescription_type"),
-                PropertiesPackage.Literals.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_PageDescription_semanticCandidateExpression_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_semanticCandidateExpression_feature", "_UI_PageDescription_type"),
+                 PropertiesPackage.Literals.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Groups feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Groups feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addGroupsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PageDescription_groups_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_groups_feature", "_UI_PageDescription_type"),
-                PropertiesPackage.Literals.PAGE_DESCRIPTION__GROUPS, true, false, true, null, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_PageDescription_groups_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_groups_feature", "_UI_PageDescription_type"),
+                 PropertiesPackage.Literals.PAGE_DESCRIPTION__GROUPS,
+                 true,
+                 false,
+                 true,
+                 null,
+                 null,
+                 null));
     }
 
     /**
-     * This returns PageDescription.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This returns PageDescription.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -142,23 +200,25 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((PageDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_PageDescription_type") : getString("_UI_PageDescription_type") + " " + label;
+        String label = ((PageDescription)object).getIdentifier();
+        return label == null || label.length() == 0 ?
+            getString("_UI_PageDescription_type") :
+            getString("_UI_PageDescription_type") + " " + label;
     }
+    
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -166,21 +226,21 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
         updateChildren(notification);
 
         switch (notification.getFeatureID(PageDescription.class)) {
-        case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
-        case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
-        case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
-        case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
+            case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
+            case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
+            case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
+            case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
         }
         super.notifyChanged(notification);
     }
 
     /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-     * describing the children that can be created under this object. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -189,9 +249,9 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     }
 
     /**
-     * Return the resource locator for this item provider's resources. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Return the resource locator for this item provider's resources.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
index 96fdd92ca1..f636caf86c 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
@@ -12,47 +12,54 @@
 package org.eclipse.sirius.properties.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-import org.eclipse.sirius.expression.provider.ExpressionEditPlugin;
+
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
- * This is the central singleton for the Properties edit plugin. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the central singleton for the Properties edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
 public final class PropertiesEditPlugin extends EMFPlugin {
     /**
-     * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Keep track of the singleton.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public static final PropertiesEditPlugin INSTANCE = new PropertiesEditPlugin();
 
     /**
-     * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Keep track of the singleton.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private static Implementation plugin;
 
     /**
-     * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Create the instance.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PropertiesEditPlugin() {
-        super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, ExpressionEditPlugin.INSTANCE, SiriusEditPlugin.INSTANCE, });
+        super
+          (new ResourceLocator [] {
+             EcoreEditPlugin.INSTANCE,
+             SiriusEditPlugin.INSTANCE,
+           });
     }
 
     /**
-     * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
+     * Returns the singleton instance of the Eclipse plugin.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the singleton instance.
      * @generated
      */
@@ -62,9 +69,9 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     }
 
     /**
-     * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
+     * Returns the singleton instance of the Eclipse plugin.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the singleton instance.
      * @generated
      */
@@ -73,15 +80,16 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     }
 
     /**
-     * The actual implementation of the Eclipse <b>Plugin</b>. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The actual implementation of the Eclipse <b>Plugin</b>.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public static class Implementation extends EclipsePlugin {
         /**
-         * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         * Creates an instance.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         public Implementation() {
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
index f9f0f3f3ca..a6d1c8e4db 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
@@ -18,10 +18,15 @@ import java.util.List;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.emf.edit.command.CommandParameter;
+
 import org.eclipse.emf.edit.domain.EditingDomain;
+
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -34,53 +39,54 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.sirius.properties.PropertiesFactory;
+
 import org.eclipse.sirius.properties.util.PropertiesAdapterFactory;
+
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.Group;
+
 import org.eclipse.sirius.viewpoint.description.util.DescriptionSwitch;
 
 /**
- * This is the factory that is used to provide the interfaces needed to support
- * Viewers. The adapters generated by this factory convert EMF adapter
- * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The
- * adapters also support Eclipse property sheets. Note that most of the adapters
- * are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * 
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
 public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
     /**
-     * This keeps track of the root adapter factory that delegates to this
-     * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the root adapter factory that delegates to this adapter factory.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected ComposedAdapterFactory parentAdapterFactory;
 
     /**
-     * This is used to implement
-     * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
     /**
-     * This keeps track of all the supported types checked by
-     * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
     /**
-     * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * This constructs an instance.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PropertiesItemProviderAdapterFactory() {
@@ -92,19 +98,17 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.ViewExtensionDescription} instances.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.properties.ViewExtensionDescription} instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected ViewExtensionDescriptionItemProvider viewExtensionDescriptionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.ViewExtensionDescription}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.properties.ViewExtensionDescription}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -117,19 +121,17 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.PageDescription} instances. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.properties.PageDescription} instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected PageDescriptionItemProvider pageDescriptionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.PageDescription}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.properties.PageDescription}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -142,19 +144,17 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.GroupDescription} instances. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.properties.GroupDescription} instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected GroupDescriptionItemProvider groupDescriptionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.GroupDescription}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.properties.GroupDescription}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -167,19 +167,17 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.ContainerDescription} instances.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.properties.ContainerDescription} instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected ContainerDescriptionItemProvider containerDescriptionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.ContainerDescription}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.properties.ContainerDescription}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -192,19 +190,17 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.TextDescription} instances. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.properties.TextDescription} instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected TextDescriptionItemProvider textDescriptionItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.TextDescription}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This creates an adapter for a {@link org.eclipse.sirius.properties.TextDescription}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -217,59 +213,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.CheckboxDescription} instances. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected CheckboxDescriptionItemProvider checkboxDescriptionItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.CheckboxDescription}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createCheckboxDescriptionAdapter() {
-        if (checkboxDescriptionItemProvider == null) {
-            checkboxDescriptionItemProvider = new CheckboxDescriptionItemProvider(this);
-        }
-
-        return checkboxDescriptionItemProvider;
-    }
-
-    /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.SelectDescription} instances. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected SelectDescriptionItemProvider selectDescriptionItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.SelectDescription}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createSelectDescriptionAdapter() {
-        if (selectDescriptionItemProvider == null) {
-            selectDescriptionItemProvider = new SelectDescriptionItemProvider(this);
-        }
-
-        return selectDescriptionItemProvider;
-    }
-
-    /**
-     * This returns the root adapter factory that contains this factory. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This returns the root adapter factory that contains this factory.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -277,9 +223,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This sets the composed adapter factory that contains this factory. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This sets the composed adapter factory that contains this factory.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -287,8 +233,8 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -297,9 +243,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This implementation substitutes the factory itself as the key for the
-     * adapter. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This implementation substitutes the factory itself as the key for the adapter.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -308,15 +254,15 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object adapt(Object object, Object type) {
         if (isFactoryForType(type)) {
             Object adapter = super.adapt(object, type);
-            if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
+            if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
                 return adapter;
             }
         }
@@ -325,8 +271,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a listener.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -334,8 +281,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This removes a listener.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -343,10 +291,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This delegates to {@link #changeNotifier} and to
-     * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void fireNotifyChanged(Notification notification) {
@@ -358,84 +305,77 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This disposes all of the item providers created by this factory. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This disposes all of the item providers created by this factory. 
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void dispose() {
-        if (viewExtensionDescriptionItemProvider != null)
-            viewExtensionDescriptionItemProvider.dispose();
-        if (pageDescriptionItemProvider != null)
-            pageDescriptionItemProvider.dispose();
-        if (groupDescriptionItemProvider != null)
-            groupDescriptionItemProvider.dispose();
-        if (containerDescriptionItemProvider != null)
-            containerDescriptionItemProvider.dispose();
-        if (textDescriptionItemProvider != null)
-            textDescriptionItemProvider.dispose();
-        if (checkboxDescriptionItemProvider != null)
-            checkboxDescriptionItemProvider.dispose();
-        if (selectDescriptionItemProvider != null)
-            selectDescriptionItemProvider.dispose();
+        if (viewExtensionDescriptionItemProvider != null) viewExtensionDescriptionItemProvider.dispose();
+        if (pageDescriptionItemProvider != null) pageDescriptionItemProvider.dispose();
+        if (groupDescriptionItemProvider != null) groupDescriptionItemProvider.dispose();
+        if (containerDescriptionItemProvider != null) containerDescriptionItemProvider.dispose();
+        if (textDescriptionItemProvider != null) textDescriptionItemProvider.dispose();
     }
 
     /**
-     * A child creation extender for the {@link DescriptionPackage}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * A child creation extender for the {@link DescriptionPackage}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public static class DescriptionChildCreationExtender implements IChildCreationExtender {
         /**
-         * The switch for creating child descriptors specific to each extended
-         * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         * The switch for creating child descriptors specific to each extended class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         protected static class CreationSwitch extends DescriptionSwitch<Object> {
             /**
-             * The child descriptors being populated. <!-- begin-user-doc -->
+             * The child descriptors being populated.
+             * <!-- begin-user-doc -->
              * <!-- end-user-doc -->
-             * 
              * @generated
              */
             protected List<Object> newChildDescriptors;
 
             /**
-             * The domain in which to create the children. <!-- begin-user-doc
-             * --> <!-- end-user-doc -->
-             * 
+             * The domain in which to create the children.
+             * <!-- begin-user-doc -->
+             * <!-- end-user-doc -->
              * @generated
              */
             protected EditingDomain editingDomain;
 
             /**
-             * Creates the a switch for populating child descriptors in the
-             * given domain. <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             * Creates the a switch for populating child descriptors in the given domain.
+             * <!-- begin-user-doc -->
+             * <!-- end-user-doc -->
              * @generated
              */
             CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
                 this.newChildDescriptors = newChildDescriptors;
                 this.editingDomain = editingDomain;
             }
-
             /**
-             * <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             * <!-- begin-user-doc -->
+             * <!-- end-user-doc -->
              * @generated
              */
             @Override
             public Object caseGroup(Group object) {
-                newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.GROUP__EXTENSIONS, PropertiesFactory.eINSTANCE.createViewExtensionDescription()));
+                newChildDescriptors.add
+                    (createChildParameter
+                        (DescriptionPackage.Literals.GROUP__EXTENSIONS,
+                         PropertiesFactory.eINSTANCE.createViewExtensionDescription()));
 
                 return null;
             }
-
+ 
             /**
-             * <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             * <!-- begin-user-doc -->
+             * <!-- end-user-doc -->
              * @generated
              */
             protected CommandParameter createChildParameter(Object feature, Object child) {
@@ -445,19 +385,19 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         }
 
         /**
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
             ArrayList<Object> result = new ArrayList<Object>();
-            new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
+            new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
             return result;
         }
 
         /**
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         public ResourceLocator getResourceLocator() {
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
deleted file mode 100644
index 8e79cd54b0..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Obeo - initial API and implementation
- * 
- */
-package org.eclipse.sirius.properties.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.SelectDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
-
-/**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.SelectDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public SelectDescriptionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
-
-    /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
-
-            addValueExpressionPropertyDescriptor(object);
-            addMultiplePropertyDescriptor(object);
-            addCandidatesExpressionPropertyDescriptor(object);
-            addCandidateDisplayExpressionPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
-
-    /**
-     * This adds a property descriptor for the Value Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addValueExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectDescription_valueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_valueExpression_feature", "_UI_SelectDescription_type"),
-                PropertiesPackage.Literals.SELECT_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-    }
-
-    /**
-     * This adds a property descriptor for the Multiple feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addMultiplePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectDescription_multiple_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_multiple_feature", "_UI_SelectDescription_type"),
-                PropertiesPackage.Literals.SELECT_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-    }
-
-    /**
-     * This adds a property descriptor for the Candidates Expression feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectDescription_candidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidatesExpression_feature", "_UI_SelectDescription_type"),
-                PropertiesPackage.Literals.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-    }
-
-    /**
-     * This adds a property descriptor for the Candidate Display Expression
-     * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addCandidateDisplayExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectDescription_candidateDisplayExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidateDisplayExpression_feature", "_UI_SelectDescription_type"),
-                PropertiesPackage.Literals.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-    }
-
-    /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION);
-        }
-        return childrenFeatures;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
-        // adding (see {@link AddCommand}) it as a child.
-
-        return super.getChildFeature(object, child);
-    }
-
-    /**
-     * This returns SelectDescription.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectDescription"));
-    }
-
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((SelectDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_SelectDescription_type") : getString("_UI_SelectDescription_type") + " " + label;
-    }
-
-    /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-
-        switch (notification.getFeatureID(SelectDescription.class)) {
-        case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-        case PropertiesPackage.SELECT_DESCRIPTION__MULTIPLE:
-        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
-        }
-        super.notifyChanged(notification);
-    }
-
-    /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-     * describing the children that can be created under this object. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
-    }
-
-}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
index fec8a0b65e..afbd647760 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
@@ -11,32 +11,36 @@
  */
 package org.eclipse.sirius.properties.provider;
 
+
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.TextDescription;
+
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.TextDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.properties.TextDescription} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
 public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public TextDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -44,9 +48,9 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     }
 
     /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -60,25 +64,33 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     }
 
     /**
-     * This adds a property descriptor for the Value Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Value Expression feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TextDescription_valueExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextDescription_valueExpression_feature", "_UI_TextDescription_type"),
-                PropertiesPackage.Literals.TEXT_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TextDescription_valueExpression_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TextDescription_valueExpression_feature", "_UI_TextDescription_type"),
+                 PropertiesPackage.Literals.TEXT_DESCRIPTION__VALUE_EXPRESSION,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -91,23 +103,22 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
+        // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
         return super.getChildFeature(object, child);
     }
 
     /**
-     * This returns TextDescription.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This returns TextDescription.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -116,23 +127,25 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((TextDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_TextDescription_type") : getString("_UI_TextDescription_type") + " " + label;
+        String label = ((TextDescription)object).getIdentifier();
+        return label == null || label.length() == 0 ?
+            getString("_UI_TextDescription_type") :
+            getString("_UI_TextDescription_type") + " " + label;
     }
+    
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -140,28 +153,31 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
         updateChildren(notification);
 
         switch (notification.getFeatureID(TextDescription.class)) {
-        case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
+            case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
+            case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+                return;
         }
         super.notifyChanged(notification);
     }
 
     /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-     * describing the children that can be created under this object. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION,
+                 ToolFactory.eINSTANCE.createInitialOperation()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
index e4816086f1..c5ad842790 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
@@ -11,13 +11,17 @@
  */
 package org.eclipse.sirius.properties.provider;
 
+
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,23 +32,29 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.ViewExtensionDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.properties.ViewExtensionDescription} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
-public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+public class ViewExtensionDescriptionItemProvider 
+    extends ItemProviderAdapter
+    implements
+        IEditingDomainItemProvider,
+        IStructuredItemContentProvider,
+        ITreeItemContentProvider,
+        IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public ViewExtensionDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +62,9 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     }
 
     /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -65,85 +75,105 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
             addIdentifierPropertyDescriptor(object);
             addMetamodelsPropertyDescriptor(object);
             addDefaultPagePropertyDescriptor(object);
-            addPreconditionExpressionPropertyDescriptor(object);
             addLabelExpressionPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Identifier feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ViewExtensionDescription_identifier_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_identifier_feature", "_UI_ViewExtensionDescription_type"),
-                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_ViewExtensionDescription_identifier_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_identifier_feature", "_UI_ViewExtensionDescription_type"),
+                 PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Metamodels feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Metamodels feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addMetamodelsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ViewExtensionDescription_metamodels_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_metamodels_feature", "_UI_ViewExtensionDescription_type"),
-                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__METAMODELS, true, false, true, null, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_ViewExtensionDescription_metamodels_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_metamodels_feature", "_UI_ViewExtensionDescription_type"),
+                 PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__METAMODELS,
+                 true,
+                 false,
+                 true,
+                 null,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Default Page feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Default Page feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addDefaultPagePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ViewExtensionDescription_defaultPage_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_defaultPage_feature", "_UI_ViewExtensionDescription_type"),
-                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE, true, false, true, null, null, null));
-    }
-
-    /**
-     * This adds a property descriptor for the Precondition Expression feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addPreconditionExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ViewExtensionDescription_preconditionExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_preconditionExpression_feature", "_UI_ViewExtensionDescription_type"),
-                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_ViewExtensionDescription_defaultPage_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_defaultPage_feature", "_UI_ViewExtensionDescription_type"),
+                 PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE,
+                 true,
+                 false,
+                 true,
+                 null,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Label Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Label Expression feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ViewExtensionDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_labelExpression_feature", "_UI_ViewExtensionDescription_type"),
-                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_ViewExtensionDescription_labelExpression_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_labelExpression_feature", "_UI_ViewExtensionDescription_type"),
+                 PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -157,23 +187,22 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
+        // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
         return super.getChildFeature(object, child);
     }
 
     /**
-     * This returns ViewExtensionDescription.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This returns ViewExtensionDescription.gif.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -182,23 +211,25 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((ViewExtensionDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_ViewExtensionDescription_type") : getString("_UI_ViewExtensionDescription_type") + " " + label;
+        String label = ((ViewExtensionDescription)object).getIdentifier();
+        return label == null || label.length() == 0 ?
+            getString("_UI_ViewExtensionDescription_type") :
+            getString("_UI_ViewExtensionDescription_type") + " " + label;
     }
+    
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -206,39 +237,44 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
         updateChildren(notification);
 
         switch (notification.getFeatureID(ViewExtensionDescription.class)) {
-        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
-        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION:
-        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
-        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
+            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
+            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
+            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
+            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+                return;
         }
         super.notifyChanged(notification);
     }
 
     /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-     * describing the children that can be created under this object. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PAGES, PropertiesFactory.eINSTANCE.createPageDescription()));
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PAGES,
+                 PropertiesFactory.eINSTANCE.createPageDescription()));
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS, PropertiesFactory.eINSTANCE.createGroupDescription()));
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS,
+                 PropertiesFactory.eINSTANCE.createGroupDescription()));
     }
 
     /**
-     * Return the resource locator for this item provider's resources. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Return the resource locator for this item provider's resources.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
index 7d4a7be4b8..29e7d4345b 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
@@ -11,12 +11,15 @@
  */
 package org.eclipse.sirius.properties.provider;
 
+
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,22 +30,28 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.WidgetDescription;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.WidgetDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the item provider adapter for a {@link org.eclipse.sirius.properties.WidgetDescription} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
-public class WidgetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+public class WidgetDescriptionItemProvider 
+    extends ItemProviderAdapter
+    implements
+        IEditingDomainItemProvider,
+        IStructuredItemContentProvider,
+        ITreeItemContentProvider,
+        IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public WidgetDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -50,9 +59,9 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
     }
 
     /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -62,67 +71,74 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
 
             addIdentifierPropertyDescriptor(object);
             addLabelExpressionPropertyDescriptor(object);
-            addDomainCandidatesExpressionPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Identifier feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_WidgetDescription_identifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_identifier_feature", "_UI_WidgetDescription_type"),
-                PropertiesPackage.Literals.WIDGET_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_WidgetDescription_identifier_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_identifier_feature", "_UI_WidgetDescription_type"),
+                 PropertiesPackage.Literals.WIDGET_DESCRIPTION__IDENTIFIER,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This adds a property descriptor for the Label Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds a property descriptor for the Label Expression feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_WidgetDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_labelExpression_feature", "_UI_WidgetDescription_type"),
-                PropertiesPackage.Literals.WIDGET_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-    }
-
-    /**
-     * This adds a property descriptor for the Domain Candidates Expression
-     * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addDomainCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_WidgetDescription_domainCandidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_domainCandidatesExpression_feature", "_UI_WidgetDescription_type"),
-                PropertiesPackage.Literals.WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_WidgetDescription_labelExpression_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_labelExpression_feature", "_UI_WidgetDescription_type"),
+                 PropertiesPackage.Literals.WIDGET_DESCRIPTION__LABEL_EXPRESSION,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((WidgetDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_WidgetDescription_type") : getString("_UI_WidgetDescription_type") + " " + label;
+        String label = ((WidgetDescription)object).getIdentifier();
+        return label == null || label.length() == 0 ?
+            getString("_UI_WidgetDescription_type") :
+            getString("_UI_WidgetDescription_type") + " " + label;
     }
+    
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -130,20 +146,19 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
         updateChildren(notification);
 
         switch (notification.getFeatureID(WidgetDescription.class)) {
-        case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
-        case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
-        case PropertiesPackage.WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
+            case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
+            case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
         }
         super.notifyChanged(notification);
     }
 
     /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-     * describing the children that can be created under this object. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -152,9 +167,9 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
     }
 
     /**
-     * Return the resource locator for this item provider's resources. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Return the resource locator for this item provider's resources.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/META-INF/MANIFEST.MF b/incubation/org.eclipse.sirius.properties/META-INF/MANIFEST.MF
index b06badd055..39bc91f6c7 100644
--- a/incubation/org.eclipse.sirius.properties/META-INF/MANIFEST.MF
+++ b/incubation/org.eclipse.sirius.properties/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Export-Package: org.eclipse.sirius.properties,
  org.eclipse.sirius.properties.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.sirius.expression;visibility:=reexport,
  org.eclipse.sirius;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/incubation/org.eclipse.sirius.properties/build.properties b/incubation/org.eclipse.sirius.properties/build.properties
index 1e42f5c056..f6b2ec4792 100644
--- a/incubation/org.eclipse.sirius.properties/build.properties
+++ b/incubation/org.eclipse.sirius.properties/build.properties
@@ -14,5 +14,6 @@ bin.includes = .,\
                plugin.xml,\
                plugin.properties
 jars.compile.order = .
-source.. = src-gen/
+source.. = src-gen/,\
+           src/
 output.. = bin/
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.ecore b/incubation/org.eclipse.sirius.properties/model/properties.ecore
index a5b86edecb..c884bb5e1b 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.ecore
+++ b/incubation/org.eclipse.sirius.properties/model/properties.ecore
@@ -10,29 +10,27 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="pages" upperBound="-1"
         eType="#//PageDescription" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="defaultPage" eType="#//PageDescription"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preconditionExpression"
-        eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
         eType="#//GroupDescription" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PageDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainClass" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/TypeName"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="semanticCandidateExpression"
-        eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
+        eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
         eType="#//GroupDescription"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GroupDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainClass" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/TypeName"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="semanticCandidateExpression"
-        eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
+        eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//ContainerDescription"
         containment="true"/>
   </eClassifiers>
@@ -45,30 +43,12 @@
   <eClassifiers xsi:type="ecore:EClass" name="WidgetDescription" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainCandidatesExpression"
-        eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TextDescription" eSuperTypes="#//WidgetDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CheckboxDescription" eSuperTypes="#//WidgetDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SelectDescription" eSuperTypes="#//WidgetDescription">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="candidatesExpression" eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="candidateDisplayExpression"
-        eType="ecore:EDataType ../../org.eclipse.sirius.expression/model/expression.ecore#//Expression"/>
-  </eClassifiers>
 </ecore:EPackage>
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.genmodel b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
index 4249b72196..dd717f9401 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.genmodel
+++ b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
@@ -5,7 +5,7 @@
     editorDirectory="/org.eclipse.sirius.properties.editor/src-gen" modelPluginID="org.eclipse.sirius.properties"
     modelName="Properties" modelPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    runtimeVersion="2.3" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius.expression/model/expression.genmodel#//expression ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
+    runtimeVersion="2.3" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
     importOrganizing="true">
   <foreignModel>properties.ecore</foreignModel>
   <genPackages prefix="Properties" basePackage="org.eclipse.sirius" disposableProviderFactory="true"
@@ -16,7 +16,6 @@
       <genFeatures property="None" children="true" createChild="true" propertyCategory=""
           ecoreFeature="ecore:EReference properties.ecore#//ViewExtensionDescription/pages"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//ViewExtensionDescription/defaultPage"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ViewExtensionDescription/preconditionExpression"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ViewExtensionDescription/labelExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ViewExtensionDescription/groups"/>
     </genClasses>
@@ -41,23 +40,10 @@
     <genClasses image="false" ecoreClass="properties.ecore#//WidgetDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//WidgetDescription/identifier"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//WidgetDescription/labelExpression"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//WidgetDescription/domainCandidatesExpression"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//TextDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextDescription/valueExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//TextDescription/initialOperation"/>
     </genClasses>
-    <genClasses ecoreClass="properties.ecore#//CheckboxDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//CheckboxDescription/valueExpression"/>
-      <genFeatures property="None" notify="false" children="true" createChild="true"
-          ecoreFeature="ecore:EReference properties.ecore#//CheckboxDescription/initialOperation"/>
-    </genClasses>
-    <genClasses ecoreClass="properties.ecore#//SelectDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/valueExpression"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//SelectDescription/initialOperation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/multiple"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidatesExpression"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidateDisplayExpression"/>
-    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
deleted file mode 100644
index 5cbe3a6164..0000000000
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Obeo - initial API and implementation
- * 
- */
-package org.eclipse.sirius.properties;
-
-import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Checkbox Description</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation <em>Initial Operation</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription()
- * @model
- * @generated
- */
-public interface CheckboxDescription extends WidgetDescription {
-    /**
-     * Returns the value of the '<em><b>Value Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Value Expression</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Value Expression</em>' attribute.
-     * @see #setValueExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription_ValueExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
-     * @generated
-     */
-    String getValueExpression();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @param value the new value of the '<em>Value Expression</em>' attribute.
-     * @see #getValueExpression()
-     * @generated
-     */
-    void setValueExpression(String value);
-
-    /**
-     * Returns the value of the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Initial Operation</em>' reference isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Initial Operation</em>' containment reference.
-     * @see #setInitialOperation(InitialOperation)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription_InitialOperation()
-     * @model containment="true" required="true"
-     * @generated
-     */
-    InitialOperation getInitialOperation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @param value the new value of the '<em>Initial Operation</em>' containment reference.
-     * @see #getInitialOperation()
-     * @generated
-     */
-    void setInitialOperation(InitialOperation value);
-
-} // CheckboxDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
index 9af99fa85f..81839f4613 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
@@ -12,11 +12,13 @@
 package org.eclipse.sirius.properties;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Container Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Container Description</b></em>'.
+ * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
@@ -32,14 +34,13 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface ContainerDescription extends EObject {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
-     * really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getContainerDescription_Identifier()
@@ -50,8 +51,8 @@ public interface ContainerDescription extends EObject {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
@@ -59,16 +60,14 @@ public interface ContainerDescription extends EObject {
     void setIdentifier(String value);
 
     /**
-     * Returns the value of the '<em><b>Widgets</b></em>' containment reference
-     * list. The list contents are of type
-     * {@link org.eclipse.sirius.properties.WidgetDescription}. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Widgets</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.sirius.properties.WidgetDescription}.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Widgets</em>' containment reference list isn't
-     * clear, there really should be more of a description here...
+     * If the meaning of the '<em>Widgets</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Widgets</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getContainerDescription_Widgets()
      * @model containment="true"
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
index 721475c3e7..c01c16a8ee 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
@@ -14,8 +14,9 @@ package org.eclipse.sirius.properties;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Group Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Group Description</b></em>'.
+ * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
@@ -34,14 +35,13 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface GroupDescription extends EObject {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
-     * really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_Identifier()
@@ -52,8 +52,8 @@ public interface GroupDescription extends EObject {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
@@ -71,15 +71,15 @@ public interface GroupDescription extends EObject {
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_LabelExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
+     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getLabelExpression();
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
      * @generated
@@ -87,14 +87,13 @@ public interface GroupDescription extends EObject {
     void setLabelExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Domain Class</b></em>' attribute. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Domain Class</b></em>' attribute.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Domain Class</em>' attribute isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Domain Class</em>' attribute.
      * @see #setDomainClass(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_DomainClass()
@@ -105,8 +104,8 @@ public interface GroupDescription extends EObject {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getDomainClass <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Domain Class</em>' attribute.
      * @see #getDomainClass()
      * @generated
@@ -117,22 +116,22 @@ public interface GroupDescription extends EObject {
      * Returns the value of the '<em><b>Semantic Candidate Expression</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Semantic Candidate Expression</em>' attribute
-     * isn't clear, there really should be more of a description here...
+     * If the meaning of the '<em>Semantic Candidate Expression</em>' attribute isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Semantic Candidate Expression</em>' attribute.
      * @see #setSemanticCandidateExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_SemanticCandidateExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
+     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getSemanticCandidateExpression();
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Semantic Candidate Expression</em>' attribute.
      * @see #getSemanticCandidateExpression()
      * @generated
@@ -143,8 +142,8 @@ public interface GroupDescription extends EObject {
      * Returns the value of the '<em><b>Container</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Container</em>' containment reference isn't
-     * clear, there really should be more of a description here...
+     * If the meaning of the '<em>Container</em>' containment reference isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Container</em>' containment reference.
@@ -157,8 +156,8 @@ public interface GroupDescription extends EObject {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getContainer <em>Container</em>}' containment reference.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Container</em>' containment reference.
      * @see #getContainer()
      * @generated
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
index 576936b6de..e3de7b1357 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
@@ -12,11 +12,13 @@
 package org.eclipse.sirius.properties;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Page Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Page Description</b></em>'.
+ * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
@@ -35,14 +37,13 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface PageDescription extends EObject {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
-     * really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_Identifier()
@@ -53,8 +54,8 @@ public interface PageDescription extends EObject {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.PageDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
@@ -72,15 +73,15 @@ public interface PageDescription extends EObject {
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_LabelExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
+     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getLabelExpression();
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.PageDescription#getLabelExpression <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
      * @generated
@@ -88,14 +89,13 @@ public interface PageDescription extends EObject {
     void setLabelExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Domain Class</b></em>' attribute. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Domain Class</b></em>' attribute.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Domain Class</em>' attribute isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Domain Class</em>' attribute.
      * @see #setDomainClass(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_DomainClass()
@@ -106,8 +106,8 @@ public interface PageDescription extends EObject {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.PageDescription#getDomainClass <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Domain Class</em>' attribute.
      * @see #getDomainClass()
      * @generated
@@ -118,22 +118,22 @@ public interface PageDescription extends EObject {
      * Returns the value of the '<em><b>Semantic Candidate Expression</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Semantic Candidate Expression</em>' attribute
-     * isn't clear, there really should be more of a description here...
+     * If the meaning of the '<em>Semantic Candidate Expression</em>' attribute isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Semantic Candidate Expression</em>' attribute.
      * @see #setSemanticCandidateExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_SemanticCandidateExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
+     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getSemanticCandidateExpression();
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Semantic Candidate Expression</em>' attribute.
      * @see #getSemanticCandidateExpression()
      * @generated
@@ -141,16 +141,14 @@ public interface PageDescription extends EObject {
     void setSemanticCandidateExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Groups</b></em>' reference list. The
-     * list contents are of type
-     * {@link org.eclipse.sirius.properties.GroupDescription}. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Groups</b></em>' reference list.
+     * The list contents are of type {@link org.eclipse.sirius.properties.GroupDescription}.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Groups</em>' reference list isn't clear, there
-     * really should be more of a description here...
+     * If the meaning of the '<em>Groups</em>' reference list isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Groups</em>' reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_Groups()
      * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
index 74fce832ae..7730a5c02b 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
@@ -14,84 +14,68 @@ package org.eclipse.sirius.properties;
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
- * create method for each non-abstract class of the model. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
 public interface PropertiesFactory extends EFactory {
     /**
      * The singleton instance of the factory.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     PropertiesFactory eINSTANCE = org.eclipse.sirius.properties.impl.PropertiesFactoryImpl.init();
 
     /**
-     * Returns a new object of class '<em>View Extension Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Returns a new object of class '<em>View Extension Description</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return a new object of class '<em>View Extension Description</em>'.
      * @generated
      */
     ViewExtensionDescription createViewExtensionDescription();
 
     /**
-     * Returns a new object of class '<em>Page Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Returns a new object of class '<em>Page Description</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return a new object of class '<em>Page Description</em>'.
      * @generated
      */
     PageDescription createPageDescription();
 
     /**
-     * Returns a new object of class '<em>Group Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Returns a new object of class '<em>Group Description</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return a new object of class '<em>Group Description</em>'.
      * @generated
      */
     GroupDescription createGroupDescription();
 
     /**
-     * Returns a new object of class '<em>Container Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Returns a new object of class '<em>Container Description</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return a new object of class '<em>Container Description</em>'.
      * @generated
      */
     ContainerDescription createContainerDescription();
 
     /**
-     * Returns a new object of class '<em>Text Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Returns a new object of class '<em>Text Description</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return a new object of class '<em>Text Description</em>'.
      * @generated
      */
     TextDescription createTextDescription();
 
     /**
-     * Returns a new object of class '<em>Checkbox Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return a new object of class '<em>Checkbox Description</em>'.
-     * @generated
-     */
-    CheckboxDescription createCheckboxDescription();
-
-    /**
-     * Returns a new object of class '<em>Select Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return a new object of class '<em>Select Description</em>'.
-     * @generated
-     */
-    SelectDescription createSelectDescription();
-
-    /**
      * Returns the package supported by this factory.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -100,4 +84,4 @@ public interface PropertiesFactory extends EFactory {
      */
     PropertiesPackage getPropertiesPackage();
 
-} // PropertiesFactory
+} //PropertiesFactory
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
index 93f29e0aea..79d9b7cf90 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
@@ -15,17 +15,18 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 /**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
- * accessors for the meta objects to represent
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
  * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * @see org.eclipse.sirius.properties.PropertiesFactory
@@ -35,37 +36,40 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 public interface PropertiesPackage extends EPackage {
     /**
      * The package name.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     String eNAME = "properties";
 
     /**
      * The package namespace URI.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     String eNS_URI = "http://www.eclipse.org/sirius/properties/1.0.0";
 
     /**
      * The package namespace name.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     String eNS_PREFIX = "properties";
 
     /**
      * The singleton instance of the package.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     PropertiesPackage eINSTANCE = org.eclipse.sirius.properties.impl.PropertiesPackageImpl.init();
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl <em>View Extension Description</em>}' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getViewExtensionDescription()
      * @generated
@@ -73,18 +77,18 @@ public interface PropertiesPackage extends EPackage {
     int VIEW_EXTENSION_DESCRIPTION = 0;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__IDENTIFIER = DescriptionPackage.EXTENSION_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Metamodels</b></em>' reference list. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Metamodels</b></em>' reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -92,59 +96,53 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Pages</b></em>' containment reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__PAGES = DescriptionPackage.EXTENSION_FEATURE_COUNT + 2;
 
     /**
-     * The feature id for the '<em><b>Default Page</b></em>' reference. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Default Page</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE = DescriptionPackage.EXTENSION_FEATURE_COUNT + 3;
 
     /**
-     * The feature id for the '<em><b>Precondition Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION = DescriptionPackage.EXTENSION_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION = DescriptionPackage.EXTENSION_FEATURE_COUNT + 5;
+    int VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION = DescriptionPackage.EXTENSION_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Groups</b></em>' containment reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int VIEW_EXTENSION_DESCRIPTION__GROUPS = DescriptionPackage.EXTENSION_FEATURE_COUNT + 6;
+    int VIEW_EXTENSION_DESCRIPTION__GROUPS = DescriptionPackage.EXTENSION_FEATURE_COUNT + 5;
 
     /**
      * The number of structural features of the '<em>View Extension Description</em>' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int VIEW_EXTENSION_DESCRIPTION_FEATURE_COUNT = DescriptionPackage.EXTENSION_FEATURE_COUNT + 7;
+    int VIEW_EXTENSION_DESCRIPTION_FEATURE_COUNT = DescriptionPackage.EXTENSION_FEATURE_COUNT + 6;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl <em>Page Description</em>}' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see org.eclipse.sirius.properties.impl.PageDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageDescription()
      * @generated
@@ -152,27 +150,27 @@ public interface PropertiesPackage extends EPackage {
     int PAGE_DESCRIPTION = 1;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION__IDENTIFIER = 0;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION__LABEL_EXPRESSION = 1;
 
     /**
-     * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Domain Class</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -180,16 +178,17 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Semantic Candidate Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = 3;
 
     /**
-     * The feature id for the '<em><b>Groups</b></em>' reference list. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Groups</b></em>' reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -197,7 +196,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The number of structural features of the '<em>Page Description</em>' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -205,8 +205,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl <em>Group Description</em>}' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see org.eclipse.sirius.properties.impl.GroupDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupDescription()
      * @generated
@@ -214,27 +214,27 @@ public interface PropertiesPackage extends EPackage {
     int GROUP_DESCRIPTION = 2;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int GROUP_DESCRIPTION__IDENTIFIER = 0;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int GROUP_DESCRIPTION__LABEL_EXPRESSION = 1;
 
     /**
-     * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Domain Class</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -242,7 +242,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Semantic Candidate Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -250,7 +251,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Container</b></em>' containment reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -258,7 +260,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The number of structural features of the '<em>Group Description</em>' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -266,8 +269,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl <em>Container Description</em>}' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getContainerDescription()
      * @generated
@@ -275,9 +278,9 @@ public interface PropertiesPackage extends EPackage {
     int CONTAINER_DESCRIPTION = 3;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -285,7 +288,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Widgets</b></em>' containment reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -293,7 +297,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The number of structural features of the '<em>Container Description</em>' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -301,8 +306,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl <em>Widget Description</em>}' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetDescription()
      * @generated
@@ -310,43 +315,36 @@ public interface PropertiesPackage extends EPackage {
     int WIDGET_DESCRIPTION = 4;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int WIDGET_DESCRIPTION__IDENTIFIER = 0;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int WIDGET_DESCRIPTION__LABEL_EXPRESSION = 1;
 
     /**
-     * The feature id for the '<em><b>Domain Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION = 2;
-
-    /**
      * The number of structural features of the '<em>Widget Description</em>' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int WIDGET_DESCRIPTION_FEATURE_COUNT = 3;
+    int WIDGET_DESCRIPTION_FEATURE_COUNT = 2;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl <em>Text Description</em>}' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see org.eclipse.sirius.properties.impl.TextDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextDescription()
      * @generated
@@ -354,35 +352,27 @@ public interface PropertiesPackage extends EPackage {
     int TEXT_DESCRIPTION = 5;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int TEXT_DESCRIPTION__IDENTIFIER = WIDGET_DESCRIPTION__IDENTIFIER;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int TEXT_DESCRIPTION__LABEL_EXPRESSION = WIDGET_DESCRIPTION__LABEL_EXPRESSION;
 
     /**
-     * The feature id for the '<em><b>Domain Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int TEXT_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION = WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The feature id for the '<em><b>Value Expression</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -390,7 +380,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -398,163 +389,18 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The number of structural features of the '<em>Text Description</em>' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int TEXT_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
-    /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl <em>Checkbox Description</em>}' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @see org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
-     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxDescription()
-     * @generated
-     */
-    int CHECKBOX_DESCRIPTION = 6;
-
-    /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CHECKBOX_DESCRIPTION__IDENTIFIER = WIDGET_DESCRIPTION__IDENTIFIER;
-
-    /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CHECKBOX_DESCRIPTION__LABEL_EXPRESSION = WIDGET_DESCRIPTION__LABEL_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Domain Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CHECKBOX_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION = WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CHECKBOX_DESCRIPTION__VALUE_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CHECKBOX_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
-
-    /**
-     * The number of structural features of the '<em>Checkbox Description</em>' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CHECKBOX_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl <em>Select Description</em>}' class.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @see org.eclipse.sirius.properties.impl.SelectDescriptionImpl
-     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectDescription()
-     * @generated
-     */
-    int SELECT_DESCRIPTION = 7;
-
-    /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION__IDENTIFIER = WIDGET_DESCRIPTION__IDENTIFIER;
-
-    /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION__LABEL_EXPRESSION = WIDGET_DESCRIPTION__LABEL_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Domain Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION = WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION__VALUE_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Multiple</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION__MULTIPLE = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION__CANDIDATES_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Candidate Display Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
-
-    /**
-     * The number of structural features of the '<em>Select Description</em>' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int SELECT_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 5;
 
     /**
      * Returns the meta object for class '{@link org.eclipse.sirius.properties.ViewExtensionDescription <em>View Extension Description</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for class '<em>View Extension Description</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription
      * @generated
@@ -563,7 +409,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier()
      * @see #getViewExtensionDescription()
@@ -573,7 +420,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the reference list '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels <em>Metamodels</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the reference list '<em>Metamodels</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels()
      * @see #getViewExtensionDescription()
@@ -583,7 +431,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getPages <em>Pages</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Pages</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getPages()
      * @see #getViewExtensionDescription()
@@ -593,7 +442,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the reference '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage <em>Default Page</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the reference '<em>Default Page</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage()
      * @see #getViewExtensionDescription()
@@ -602,22 +452,9 @@ public interface PropertiesPackage extends EPackage {
     EReference getViewExtensionDescription_DefaultPage();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getPreconditionExpression <em>Precondition Expression</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @return the meta object for the attribute '<em>Precondition Expression</em>'.
-     * @see org.eclipse.sirius.properties.ViewExtensionDescription#getPreconditionExpression()
-     * @see #getViewExtensionDescription()
-     * @generated
-     */
-    EAttribute getViewExtensionDescription_PreconditionExpression();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression
-     * <em>Label Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression <em>Label Expression</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Label Expression</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression()
      * @see #getViewExtensionDescription()
@@ -627,7 +464,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getGroups <em>Groups</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Groups</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getGroups()
      * @see #getViewExtensionDescription()
@@ -636,11 +474,9 @@ public interface PropertiesPackage extends EPackage {
     EReference getViewExtensionDescription_Groups();
 
     /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.PageDescription
-     * <em>Page Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for class '{@link org.eclipse.sirius.properties.PageDescription <em>Page Description</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for class '<em>Page Description</em>'.
      * @see org.eclipse.sirius.properties.PageDescription
      * @generated
@@ -649,7 +485,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.PageDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getIdentifier()
      * @see #getPageDescription()
@@ -658,11 +495,9 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getPageDescription_Identifier();
 
     /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.PageDescription#getLabelExpression
-     * <em>Label Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.PageDescription#getLabelExpression <em>Label Expression</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Label Expression</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getLabelExpression()
      * @see #getPageDescription()
@@ -672,7 +507,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.PageDescription#getDomainClass <em>Domain Class</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Domain Class</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getDomainClass()
      * @see #getPageDescription()
@@ -682,8 +518,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Semantic Candidate Expression</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression()
      * @see #getPageDescription()
@@ -693,7 +529,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the reference list '{@link org.eclipse.sirius.properties.PageDescription#getGroups <em>Groups</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the reference list '<em>Groups</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getGroups()
      * @see #getPageDescription()
@@ -702,11 +539,9 @@ public interface PropertiesPackage extends EPackage {
     EReference getPageDescription_Groups();
 
     /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.GroupDescription
-     * <em>Group Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for class '{@link org.eclipse.sirius.properties.GroupDescription <em>Group Description</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for class '<em>Group Description</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription
      * @generated
@@ -715,7 +550,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.GroupDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getIdentifier()
      * @see #getGroupDescription()
@@ -724,11 +560,9 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getGroupDescription_Identifier();
 
     /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression
-     * <em>Label Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression <em>Label Expression</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Label Expression</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getLabelExpression()
      * @see #getGroupDescription()
@@ -738,7 +572,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.GroupDescription#getDomainClass <em>Domain Class</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Domain Class</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getDomainClass()
      * @see #getGroupDescription()
@@ -748,8 +583,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Semantic Candidate Expression</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression()
      * @see #getGroupDescription()
@@ -759,7 +594,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the containment reference '{@link org.eclipse.sirius.properties.GroupDescription#getContainer <em>Container</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the containment reference '<em>Container</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getContainer()
      * @see #getGroupDescription()
@@ -769,8 +605,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for class '{@link org.eclipse.sirius.properties.ContainerDescription <em>Container Description</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for class '<em>Container Description</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription
      * @generated
@@ -779,7 +615,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription#getIdentifier()
      * @see #getContainerDescription()
@@ -789,7 +626,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.properties.ContainerDescription#getWidgets <em>Widgets</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the containment reference list '<em>Widgets</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription#getWidgets()
      * @see #getContainerDescription()
@@ -798,11 +636,9 @@ public interface PropertiesPackage extends EPackage {
     EReference getContainerDescription_Widgets();
 
     /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.WidgetDescription
-     * <em>Widget Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for class '{@link org.eclipse.sirius.properties.WidgetDescription <em>Widget Description</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for class '<em>Widget Description</em>'.
      * @see org.eclipse.sirius.properties.WidgetDescription
      * @generated
@@ -811,7 +647,8 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.WidgetDescription#getIdentifier()
      * @see #getWidgetDescription()
@@ -820,11 +657,9 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getWidgetDescription_Identifier();
 
     /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression
-     * <em>Label Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression <em>Label Expression</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Label Expression</em>'.
      * @see org.eclipse.sirius.properties.WidgetDescription#getLabelExpression()
      * @see #getWidgetDescription()
@@ -833,22 +668,9 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getWidgetDescription_LabelExpression();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.WidgetDescription#getDomainCandidatesExpression <em>Domain Candidates Expression</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @return the meta object for the attribute '<em>Domain Candidates Expression</em>'.
-     * @see org.eclipse.sirius.properties.WidgetDescription#getDomainCandidatesExpression()
-     * @see #getWidgetDescription()
-     * @generated
-     */
-    EAttribute getWidgetDescription_DomainCandidatesExpression();
-
-    /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.TextDescription
-     * <em>Text Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for class '{@link org.eclipse.sirius.properties.TextDescription <em>Text Description</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for class '<em>Text Description</em>'.
      * @see org.eclipse.sirius.properties.TextDescription
      * @generated
@@ -856,11 +678,9 @@ public interface PropertiesPackage extends EPackage {
     EClass getTextDescription();
 
     /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.TextDescription#getValueExpression
-     * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.TextDescription#getValueExpression <em>Value Expression</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Value Expression</em>'.
      * @see org.eclipse.sirius.properties.TextDescription#getValueExpression()
      * @see #getTextDescription()
@@ -869,13 +689,10 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getTextDescription_ValueExpression();
 
     /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.TextDescription#getInitialOperation
-     * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for the containment reference '
-     *         <em>Initial Operation</em>'.
+     * Returns the meta object for the containment reference '{@link org.eclipse.sirius.properties.TextDescription#getInitialOperation <em>Initial Operation</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference '<em>Initial Operation</em>'.
      * @see org.eclipse.sirius.properties.TextDescription#getInitialOperation()
      * @see #getTextDescription()
      * @generated
@@ -883,131 +700,22 @@ public interface PropertiesPackage extends EPackage {
     EReference getTextDescription_InitialOperation();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.CheckboxDescription <em>Checkbox Description</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @return the meta object for class '<em>Checkbox Description</em>'.
-     * @see org.eclipse.sirius.properties.CheckboxDescription
-     * @generated
-     */
-    EClass getCheckboxDescription();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression
-     * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for the attribute '<em>Value Expression</em>'.
-     * @see org.eclipse.sirius.properties.CheckboxDescription#getValueExpression()
-     * @see #getCheckboxDescription()
-     * @generated
-     */
-    EAttribute getCheckboxDescription_ValueExpression();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation
-     * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for the containment reference '
-     *         <em>Initial Operation</em>'.
-     * @see org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation()
-     * @see #getCheckboxDescription()
-     * @generated
-     */
-    EReference getCheckboxDescription_InitialOperation();
-
-    /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.SelectDescription
-     * <em>Select Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for class '<em>Select Description</em>'.
-     * @see org.eclipse.sirius.properties.SelectDescription
-     * @generated
-     */
-    EClass getSelectDescription();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.SelectDescription#getValueExpression
-     * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for the attribute '<em>Value Expression</em>'.
-     * @see org.eclipse.sirius.properties.SelectDescription#getValueExpression()
-     * @see #getSelectDescription()
-     * @generated
-     */
-    EAttribute getSelectDescription_ValueExpression();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation
-     * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for the containment reference '
-     *         <em>Initial Operation</em>'.
-     * @see org.eclipse.sirius.properties.SelectDescription#getInitialOperation()
-     * @see #getSelectDescription()
-     * @generated
-     */
-    EReference getSelectDescription_InitialOperation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.SelectDescription#isMultiple <em>Multiple</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Multiple</em>'.
-     * @see org.eclipse.sirius.properties.SelectDescription#isMultiple()
-     * @see #getSelectDescription()
-     * @generated
-     */
-    EAttribute getSelectDescription_Multiple();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression <em>Candidates Expression</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @return the meta object for the attribute '<em>Candidates Expression</em>'.
-     * @see org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression()
-     * @see #getSelectDescription()
-     * @generated
-     */
-    EAttribute getSelectDescription_CandidatesExpression();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression <em>Candidate Display Expression</em>}'.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @return the meta object for the attribute '<em>Candidate Display Expression</em>'.
-     * @see org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression()
-     * @see #getSelectDescription()
-     * @generated
-     */
-    EAttribute getSelectDescription_CandidateDisplayExpression();
-
-    /**
-     * Returns the factory that creates the instances of the model. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Returns the factory that creates the instances of the model.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the factory that creates the instances of the model.
      * @generated
      */
     PropertiesFactory getPropertiesFactory();
 
     /**
-     * <!-- begin-user-doc --> Defines literals for the meta objects that
-     * represent
+     * <!-- begin-user-doc -->
+     * Defines literals for the meta objects that represent
      * <ul>
-     * <li>each class,</li>
-     * <li>each feature of each class,</li>
-     * <li>each operation of each class,</li>
-     * <li>each enum,</li>
-     * <li>and each data type</li>
+     *   <li>each class,</li>
+     *   <li>each feature of each class,</li>
+     *   <li>each enum,</li>
+     *   <li>and each data type</li>
      * </ul>
      * <!-- end-user-doc -->
      * @generated
@@ -1025,59 +733,56 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute VIEW_EXTENSION_DESCRIPTION__IDENTIFIER = eINSTANCE.getViewExtensionDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Metamodels</b></em>' reference list feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__METAMODELS = eINSTANCE.getViewExtensionDescription_Metamodels();
 
         /**
          * The meta object literal for the '<em><b>Pages</b></em>' containment reference list feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__PAGES = eINSTANCE.getViewExtensionDescription_Pages();
 
         /**
          * The meta object literal for the '<em><b>Default Page</b></em>' reference feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE = eINSTANCE.getViewExtensionDescription_DefaultPage();
 
         /**
-         * The meta object literal for the '
-         * <em><b>Precondition Expression</b></em>' attribute feature. <!--
-         * begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EAttribute VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION = eINSTANCE.getViewExtensionDescription_PreconditionExpression();
-
-        /**
          * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getViewExtensionDescription_LabelExpression();
 
         /**
          * The meta object literal for the '<em><b>Groups</b></em>' containment reference list feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__GROUPS = eINSTANCE.getViewExtensionDescription_Groups();
 
         /**
          * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl <em>Page Description</em>}' class.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @see org.eclipse.sirius.properties.impl.PageDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageDescription()
          * @generated
@@ -1086,43 +791,48 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__IDENTIFIER = eINSTANCE.getPageDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getPageDescription_LabelExpression();
 
         /**
          * The meta object literal for the '<em><b>Domain Class</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__DOMAIN_CLASS = eINSTANCE.getPageDescription_DomainClass();
 
         /**
          * The meta object literal for the '<em><b>Semantic Candidate Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = eINSTANCE.getPageDescription_SemanticCandidateExpression();
 
         /**
          * The meta object literal for the '<em><b>Groups</b></em>' reference list feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EReference PAGE_DESCRIPTION__GROUPS = eINSTANCE.getPageDescription_Groups();
 
         /**
          * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl <em>Group Description</em>}' class.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @see org.eclipse.sirius.properties.impl.GroupDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupDescription()
          * @generated
@@ -1131,44 +841,48 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__IDENTIFIER = eINSTANCE.getGroupDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getGroupDescription_LabelExpression();
 
         /**
          * The meta object literal for the '<em><b>Domain Class</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__DOMAIN_CLASS = eINSTANCE.getGroupDescription_DomainClass();
 
         /**
          * The meta object literal for the '<em><b>Semantic Candidate Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = eINSTANCE.getGroupDescription_SemanticCandidateExpression();
 
         /**
          * The meta object literal for the '<em><b>Container</b></em>' containment reference feature.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EReference GROUP_DESCRIPTION__CONTAINER = eINSTANCE.getGroupDescription_Container();
 
         /**
          * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl <em>Container Description</em>}' class.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @see org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getContainerDescription()
          * @generated
@@ -1177,22 +891,24 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute CONTAINER_DESCRIPTION__IDENTIFIER = eINSTANCE.getContainerDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Widgets</b></em>' containment reference list feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EReference CONTAINER_DESCRIPTION__WIDGETS = eINSTANCE.getContainerDescription_Widgets();
 
         /**
          * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl <em>Widget Description</em>}' class.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @see org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetDescription()
          * @generated
@@ -1201,31 +917,24 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute WIDGET_DESCRIPTION__IDENTIFIER = eINSTANCE.getWidgetDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute WIDGET_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getWidgetDescription_LabelExpression();
 
         /**
-         * The meta object literal for the '
-         * <em><b>Domain Candidates Expression</b></em>' attribute feature. <!--
-         * begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EAttribute WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION = eINSTANCE.getWidgetDescription_DomainCandidatesExpression();
-
-        /**
          * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl <em>Text Description</em>}' class.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @see org.eclipse.sirius.properties.impl.TextDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextDescription()
          * @generated
@@ -1234,94 +943,20 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EAttribute TEXT_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getTextDescription_ValueExpression();
 
         /**
          * The meta object literal for the '<em><b>Initial Operation</b></em>' containment reference feature.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
         EReference TEXT_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getTextDescription_InitialOperation();
 
-        /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl <em>Checkbox Description</em>}' class.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * @see org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
-         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxDescription()
-         * @generated
-         */
-        EClass CHECKBOX_DESCRIPTION = eINSTANCE.getCheckboxDescription();
-
-        /**
-         * The meta object literal for the '<em><b>Value Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CHECKBOX_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getCheckboxDescription_ValueExpression();
-
-        /**
-         * The meta object literal for the '<em><b>Initial Operation</b></em>' containment reference feature.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * @generated
-         */
-        EReference CHECKBOX_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getCheckboxDescription_InitialOperation();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl <em>Select Description</em>}' class.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * @see org.eclipse.sirius.properties.impl.SelectDescriptionImpl
-         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectDescription()
-         * @generated
-         */
-        EClass SELECT_DESCRIPTION = eINSTANCE.getSelectDescription();
-
-        /**
-         * The meta object literal for the '<em><b>Value Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute SELECT_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getSelectDescription_ValueExpression();
-
-        /**
-         * The meta object literal for the '<em><b>Initial Operation</b></em>' containment reference feature.
-         * <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * @generated
-         */
-        EReference SELECT_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getSelectDescription_InitialOperation();
-
-        /**
-         * The meta object literal for the '<em><b>Multiple</b></em>' attribute feature.
-         * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute SELECT_DESCRIPTION__MULTIPLE = eINSTANCE.getSelectDescription_Multiple();
-
-        /**
-         * The meta object literal for the '
-         * <em><b>Candidates Expression</b></em>' attribute feature. <!--
-         * begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EAttribute SELECT_DESCRIPTION__CANDIDATES_EXPRESSION = eINSTANCE.getSelectDescription_CandidatesExpression();
-
-        /**
-         * The meta object literal for the '
-         * <em><b>Candidate Display Expression</b></em>' attribute feature. <!--
-         * begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EAttribute SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = eINSTANCE.getSelectDescription_CandidateDisplayExpression();
-
     }
 
-} // PropertiesPackage
+} //PropertiesPackage
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
deleted file mode 100644
index 728713960f..0000000000
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Obeo - initial API and implementation
- * 
- */
-package org.eclipse.sirius.properties;
-
-import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Select Description</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation <em>Initial Operation</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#isMultiple <em>Multiple</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression <em>Candidates Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression <em>Candidate Display Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription()
- * @model
- * @generated
- */
-public interface SelectDescription extends WidgetDescription {
-    /**
-     * Returns the value of the '<em><b>Value Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Value Expression</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Value Expression</em>' attribute.
-     * @see #setValueExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_ValueExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
-     * @generated
-     */
-    String getValueExpression();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.SelectDescription#getValueExpression <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @param value the new value of the '<em>Value Expression</em>' attribute.
-     * @see #getValueExpression()
-     * @generated
-     */
-    void setValueExpression(String value);
-
-    /**
-     * Returns the value of the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Initial Operation</em>' reference isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Initial Operation</em>' containment reference.
-     * @see #setInitialOperation(InitialOperation)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_InitialOperation()
-     * @model containment="true" required="true"
-     * @generated
-     */
-    InitialOperation getInitialOperation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @param value the new value of the '<em>Initial Operation</em>' containment reference.
-     * @see #getInitialOperation()
-     * @generated
-     */
-    void setInitialOperation(InitialOperation value);
-
-    /**
-     * Returns the value of the '<em><b>Multiple</b></em>' attribute. <!--
-     * begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Multiple</em>' attribute isn't clear, there
-     * really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * 
-     * @return the value of the '<em>Multiple</em>' attribute.
-     * @see #setMultiple(boolean)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_Multiple()
-     * @model
-     * @generated
-     */
-    boolean isMultiple();
-
-    /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.SelectDescription#isMultiple
-     * <em>Multiple</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @param value
-     *            the new value of the '<em>Multiple</em>' attribute.
-     * @see #isMultiple()
-     * @generated
-     */
-    void setMultiple(boolean value);
-
-    /**
-     * Returns the value of the '<em><b>Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Candidates Expression</em>' attribute isn't
-     * clear, there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Candidates Expression</em>' attribute.
-     * @see #setCandidatesExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_CandidatesExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
-     * @generated
-     */
-    String getCandidatesExpression();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression <em>Candidates Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @param value the new value of the '<em>Candidates Expression</em>' attribute.
-     * @see #getCandidatesExpression()
-     * @generated
-     */
-    void setCandidatesExpression(String value);
-
-    /**
-     * Returns the value of the '<em><b>Candidate Display Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Candidate Display Expression</em>' attribute
-     * isn't clear, there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Candidate Display Expression</em>' attribute.
-     * @see #setCandidateDisplayExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_CandidateDisplayExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
-     * @generated
-     */
-    String getCandidateDisplayExpression();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression <em>Candidate Display Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @param value the new value of the '<em>Candidate Display Expression</em>' attribute.
-     * @see #getCandidateDisplayExpression()
-     * @generated
-     */
-    void setCandidateDisplayExpression(String value);
-
-} // SelectDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
index e55edc1e01..fd43c37b41 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
@@ -14,8 +14,9 @@ package org.eclipse.sirius.properties;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Text Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Text Description</b></em>'.
+ * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
@@ -41,15 +42,15 @@ public interface TextDescription extends WidgetDescription {
      * @return the value of the '<em>Value Expression</em>' attribute.
      * @see #setValueExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription_ValueExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
+     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getValueExpression();
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.TextDescription#getValueExpression <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Value Expression</em>' attribute.
      * @see #getValueExpression()
      * @generated
@@ -60,7 +61,7 @@ public interface TextDescription extends WidgetDescription {
      * Returns the value of the '<em><b>Initial Operation</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Initial Operation</em>' reference isn't clear,
+     * If the meaning of the '<em>Initial Operation</em>' containment reference isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
@@ -74,8 +75,8 @@ public interface TextDescription extends WidgetDescription {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.TextDescription#getInitialOperation <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Initial Operation</em>' containment reference.
      * @see #getInitialOperation()
      * @generated
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
index 53d73c15d8..cbb90d2947 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
@@ -12,12 +12,15 @@
 package org.eclipse.sirius.properties;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.sirius.viewpoint.description.Extension;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>View Extension Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>View Extension Description</b></em>'.
+ * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
@@ -26,7 +29,6 @@ import org.eclipse.sirius.viewpoint.description.Extension;
  *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels <em>Metamodels</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getPages <em>Pages</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage <em>Default Page</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getPreconditionExpression <em>Precondition Expression</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression <em>Label Expression</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getGroups <em>Groups</em>}</li>
  * </ul>
@@ -38,14 +40,13 @@ import org.eclipse.sirius.viewpoint.description.Extension;
  */
 public interface ViewExtensionDescription extends Extension {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
-     * really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Identifier()
@@ -56,8 +57,8 @@ public interface ViewExtensionDescription extends Extension {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
@@ -65,15 +66,14 @@ public interface ViewExtensionDescription extends Extension {
     void setIdentifier(String value);
 
     /**
-     * Returns the value of the '<em><b>Metamodels</b></em>' reference list. The
-     * list contents are of type {@link org.eclipse.emf.ecore.EPackage}. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Metamodels</b></em>' reference list.
+     * The list contents are of type {@link org.eclipse.emf.ecore.EPackage}.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Metamodels</em>' reference list isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Metamodels</em>' reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Metamodels()
      * @model
@@ -82,16 +82,14 @@ public interface ViewExtensionDescription extends Extension {
     EList<EPackage> getMetamodels();
 
     /**
-     * Returns the value of the '<em><b>Pages</b></em>' containment reference
-     * list. The list contents are of type
-     * {@link org.eclipse.sirius.properties.PageDescription}. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Pages</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.sirius.properties.PageDescription}.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Pages</em>' reference list isn't clear, there
-     * really should be more of a description here...
+     * If the meaning of the '<em>Pages</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Pages</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Pages()
      * @model containment="true"
@@ -100,14 +98,13 @@ public interface ViewExtensionDescription extends Extension {
     EList<PageDescription> getPages();
 
     /**
-     * Returns the value of the '<em><b>Default Page</b></em>' reference. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Default Page</b></em>' reference.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Default Page</em>' reference isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Default Page</em>' reference.
      * @see #setDefaultPage(PageDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_DefaultPage()
@@ -118,8 +115,8 @@ public interface ViewExtensionDescription extends Extension {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage <em>Default Page</em>}' reference.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Default Page</em>' reference.
      * @see #getDefaultPage()
      * @generated
@@ -127,32 +124,6 @@ public interface ViewExtensionDescription extends Extension {
     void setDefaultPage(PageDescription value);
 
     /**
-     * Returns the value of the '<em><b>Precondition Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Precondition Expression</em>' attribute isn't
-     * clear, there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Precondition Expression</em>' attribute.
-     * @see #setPreconditionExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_PreconditionExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
-     * @generated
-     */
-    String getPreconditionExpression();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getPreconditionExpression <em>Precondition Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Precondition Expression</em>' attribute.
-     * @see #getPreconditionExpression()
-     * @generated
-     */
-    void setPreconditionExpression(String value);
-
-    /**
      * Returns the value of the '<em><b>Label Expression</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <p>
@@ -163,15 +134,15 @@ public interface ViewExtensionDescription extends Extension {
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_LabelExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
+     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getLabelExpression();
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
      * @generated
@@ -179,16 +150,14 @@ public interface ViewExtensionDescription extends Extension {
     void setLabelExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Groups</b></em>' containment reference
-     * list. The list contents are of type
-     * {@link org.eclipse.sirius.properties.GroupDescription}. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Groups</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.sirius.properties.GroupDescription}.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Groups</em>' containment reference list isn't
-     * clear, there really should be more of a description here...
+     * If the meaning of the '<em>Groups</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Groups</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Groups()
      * @model containment="true"
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
index 55af6f5640..50c06840ba 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
@@ -14,15 +14,15 @@ package org.eclipse.sirius.properties;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Widget Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Widget Description</b></em>'.
+ * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier <em>Identifier</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression <em>Label Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.WidgetDescription#getDomainCandidatesExpression <em>Domain Candidates Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -32,14 +32,13 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface WidgetDescription extends EObject {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
+     * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
-     * really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetDescription_Identifier()
@@ -50,8 +49,8 @@ public interface WidgetDescription extends EObject {
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
@@ -69,45 +68,19 @@ public interface WidgetDescription extends EObject {
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetDescription_LabelExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
+     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getLabelExpression();
 
     /**
      * Sets the value of the '{@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @param value the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
      * @generated
      */
     void setLabelExpression(String value);
 
-    /**
-     * Returns the value of the '<em><b>Domain Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Domain Candidates Expression</em>' attribute
-     * isn't clear, there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Domain Candidates Expression</em>' attribute.
-     * @see #setDomainCandidatesExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetDescription_DomainCandidatesExpression()
-     * @model dataType="org.eclipse.sirius.expression.Expression"
-     * @generated
-     */
-    String getDomainCandidatesExpression();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.WidgetDescription#getDomainCandidatesExpression <em>Domain Candidates Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @param value the new value of the '<em>Domain Candidates Expression</em>' attribute.
-     * @see #getDomainCandidatesExpression()
-     * @generated
-     */
-    void setDomainCandidatesExpression(String value);
-
 } // WidgetDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
deleted file mode 100644
index 7026d01da4..0000000000
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Obeo - initial API and implementation
- * 
- */
-package org.eclipse.sirius.properties.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.sirius.properties.CheckboxDescription;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Checkbox Description</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getInitialOperation <em>Initial Operation</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements CheckboxDescription {
-    /**
-     * The default value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @see #getValueExpression()
-     * @generated
-     * @ordered
-     */
-    protected static final String VALUE_EXPRESSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @see #getValueExpression()
-     * @generated
-     * @ordered
-     */
-    protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getInitialOperation() <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @see #getInitialOperation()
-     * @generated
-     * @ordered
-     */
-    protected InitialOperation initialOperation;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected CheckboxDescriptionImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return PropertiesPackage.Literals.CHECKBOX_DESCRIPTION;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public String getValueExpression() {
-        return valueExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setValueExpression(String newValueExpression) {
-        String oldValueExpression = valueExpression;
-        valueExpression = newValueExpression;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION, oldValueExpression, valueExpression));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public InitialOperation getInitialOperation() {
-        return initialOperation;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
-        InitialOperation oldInitialOperation = initialOperation;
-        initialOperation = newInitialOperation;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, oldInitialOperation, newInitialOperation);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
-        }
-        return msgs;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setInitialOperation(InitialOperation newInitialOperation) {
-        if (newInitialOperation != initialOperation) {
-            NotificationChain msgs = null;
-            if (initialOperation != null)
-                msgs = ((InternalEObject)initialOperation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, null, msgs);
-            if (newInitialOperation != null)
-                msgs = ((InternalEObject)newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, null, msgs);
-            msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                return basicSetInitialOperation(null, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-                return getValueExpression();
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                return getInitialOperation();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression((String)newValue);
-                return;
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression(VALUE_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)null);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-                return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                return initialOperation != null;
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (valueExpression: ");
-        result.append(valueExpression);
-        result.append(')');
-        return result.toString();
-    }
-
-} // CheckboxDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
index c6816d7655..e460822498 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
@@ -15,20 +15,26 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.WidgetDescription;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Container Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Container Description</b></em>'.
+ * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
@@ -42,7 +48,8 @@ import org.eclipse.sirius.properties.WidgetDescription;
 public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container implements ContainerDescription {
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -51,7 +58,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -60,7 +68,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * The cached value of the '{@link #getWidgets() <em>Widgets</em>}' containment reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getWidgets()
      * @generated
      * @ordered
@@ -68,7 +77,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     protected EList<WidgetDescription> widgets;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected ContainerDescriptionImpl() {
@@ -76,7 +86,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -85,7 +96,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getIdentifier() {
@@ -93,7 +105,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -104,7 +117,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EList<WidgetDescription> getWidgets() {
@@ -115,7 +129,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -128,7 +143,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -143,7 +159,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -162,7 +179,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -179,7 +197,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -194,7 +213,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -208,4 +228,4 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
         return result.toString();
     }
 
-} // ContainerDescriptionImpl
+} //ContainerDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
index 4448ca404c..7187ac6e8e 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
@@ -13,17 +13,21 @@ package org.eclipse.sirius.properties.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Group Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Group Description</b></em>'.
+ * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
@@ -40,7 +44,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
 public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implements GroupDescription {
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -49,7 +54,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -58,8 +64,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -68,8 +74,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -78,7 +84,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -87,7 +94,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -96,8 +104,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * The default value of the '{@link #getSemanticCandidateExpression() <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -106,8 +114,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * The cached value of the '{@link #getSemanticCandidateExpression() <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -116,7 +124,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * The cached value of the '{@link #getContainer() <em>Container</em>}' containment reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getContainer()
      * @generated
      * @ordered
@@ -124,7 +133,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected ContainerDescription container;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected GroupDescriptionImpl() {
@@ -132,7 +142,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -141,7 +152,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getIdentifier() {
@@ -149,7 +161,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -160,7 +173,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getLabelExpression() {
@@ -168,7 +182,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setLabelExpression(String newLabelExpression) {
@@ -179,7 +194,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getDomainClass() {
@@ -187,7 +203,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setDomainClass(String newDomainClass) {
@@ -198,7 +215,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getSemanticCandidateExpression() {
@@ -206,7 +224,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setSemanticCandidateExpression(String newSemanticCandidateExpression) {
@@ -217,7 +236,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public ContainerDescription getContainer() {
@@ -225,7 +245,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public NotificationChain basicSetContainer(ContainerDescription newContainer, NotificationChain msgs) {
@@ -239,7 +260,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setContainer(ContainerDescription newContainer) {
@@ -257,7 +279,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -270,7 +293,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -291,10 +315,10 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
@@ -318,7 +342,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -344,7 +369,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -365,7 +391,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -385,4 +412,4 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
         return result.toString();
     }
 
-} // GroupDescriptionImpl
+} //GroupDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
index f057e32a27..a78d9e5c87 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
@@ -14,18 +14,24 @@ package org.eclipse.sirius.properties.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Page Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Page Description</b></em>'.
+ * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
@@ -42,7 +48,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
 public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements PageDescription {
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -51,7 +58,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -60,8 +68,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -70,8 +78,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -80,7 +88,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -89,7 +98,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -98,8 +108,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * The default value of the '{@link #getSemanticCandidateExpression() <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -108,8 +118,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * The cached value of the '{@link #getSemanticCandidateExpression() <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -118,7 +128,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * The cached value of the '{@link #getGroups() <em>Groups</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getGroups()
      * @generated
      * @ordered
@@ -126,7 +137,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected EList<GroupDescription> groups;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected PageDescriptionImpl() {
@@ -134,7 +146,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -143,7 +156,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getIdentifier() {
@@ -151,7 +165,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -162,7 +177,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getLabelExpression() {
@@ -170,7 +186,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setLabelExpression(String newLabelExpression) {
@@ -181,7 +198,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getDomainClass() {
@@ -189,7 +207,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setDomainClass(String newDomainClass) {
@@ -200,7 +219,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getSemanticCandidateExpression() {
@@ -208,7 +228,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setSemanticCandidateExpression(String newSemanticCandidateExpression) {
@@ -219,7 +240,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EList<GroupDescription> getGroups() {
@@ -230,7 +252,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -251,7 +274,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -279,7 +303,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -305,7 +330,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -326,7 +352,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -346,4 +373,4 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
         return result.toString();
     }
 
-} // PageDescriptionImpl
+} //PageDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
index 9a9beb083e..90a824dca7 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
@@ -14,28 +14,24 @@ package org.eclipse.sirius.properties.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.sirius.properties.CheckboxDescription;
-import org.eclipse.sirius.properties.ContainerDescription;
-import org.eclipse.sirius.properties.GroupDescription;
-import org.eclipse.sirius.properties.PageDescription;
-import org.eclipse.sirius.properties.PropertiesFactory;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.SelectDescription;
-import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.ViewExtensionDescription;
+
+import org.eclipse.sirius.properties.*;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
  * @generated
  */
 public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFactory {
     /**
      * Creates the default factory implementation.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public static PropertiesFactory init() {
@@ -53,8 +49,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * Creates an instance of the factory.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PropertiesFactoryImpl() {
@@ -62,7 +58,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -73,15 +70,14 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
             case PropertiesPackage.GROUP_DESCRIPTION: return createGroupDescription();
             case PropertiesPackage.CONTAINER_DESCRIPTION: return createContainerDescription();
             case PropertiesPackage.TEXT_DESCRIPTION: return createTextDescription();
-            case PropertiesPackage.CHECKBOX_DESCRIPTION: return createCheckboxDescription();
-            case PropertiesPackage.SELECT_DESCRIPTION: return createSelectDescription();
             default:
                 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public ViewExtensionDescription createViewExtensionDescription() {
@@ -90,7 +86,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PageDescription createPageDescription() {
@@ -99,7 +96,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public GroupDescription createGroupDescription() {
@@ -108,7 +106,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public ContainerDescription createContainerDescription() {
@@ -117,7 +116,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public TextDescription createTextDescription() {
@@ -126,25 +126,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public CheckboxDescription createCheckboxDescription() {
-        CheckboxDescriptionImpl checkboxDescription = new CheckboxDescriptionImpl();
-        return checkboxDescription;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public SelectDescription createSelectDescription() {
-        SelectDescriptionImpl selectDescription = new SelectDescriptionImpl();
-        return selectDescription;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PropertiesPackage getPropertiesPackage() {
@@ -152,7 +135,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @deprecated
      * @generated
      */
@@ -161,4 +145,4 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
         return PropertiesPackage.eINSTANCE;
     }
 
-} // PropertiesFactoryImpl
+} //PropertiesFactoryImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
index 720b0514c6..566c64318f 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
@@ -16,86 +16,83 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
+
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.sirius.expression.ExpressionPackage;
-import org.eclipse.sirius.properties.CheckboxDescription;
+
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.TextDescription;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
+
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
+
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
  * @generated
  */
 public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPackage {
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private EClass viewExtensionDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private EClass pageDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private EClass groupDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private EClass containerDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private EClass widgetDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private EClass textDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass checkboxDescriptionEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass selectDescriptionEClass = null;
-
-    /**
      * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
-     * package package URI value.
-     * <p>
-     * Note: the correct way to create the package is via the static factory
-     * method {@link #init init()}, which also performs initialization of the
-     * package, or returns the registered package, if one already exists. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+     * package URI value.
+     * <p>Note: the correct way to create the package is via the static
+     * factory method {@link #init init()}, which also performs
+     * initialization of the package, or returns the registered package,
+     * if one already exists.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see org.eclipse.emf.ecore.EPackage.Registry
      * @see org.eclipse.sirius.properties.PropertiesPackage#eNS_URI
      * @see #init()
@@ -106,21 +103,19 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private static boolean isInited = false;
 
     /**
-     * Creates, registers, and initializes the <b>Package</b> for this model,
-     * and for any others upon which it depends.
-     * 
-     * <p>
-     * This method is used to initialize {@link PropertiesPackage#eINSTANCE}
-     * when that field is accessed. Clients should not invoke it directly.
-     * Instead, they should simply access that field to obtain the package. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
+     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
      * 
+     * <p>This method is used to initialize {@link PropertiesPackage#eINSTANCE} when that field is accessed.
+     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #eNS_URI
      * @see #createPackageContents()
      * @see #initializePackageContents()
@@ -135,7 +130,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         isInited = true;
 
         // Initialize simple dependencies
-        ExpressionPackage.eINSTANCE.eClass();
         ViewpointPackage.eINSTANCE.eClass();
 
         // Create package meta-data objects
@@ -154,7 +148,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EClass getViewExtensionDescription() {
@@ -162,7 +157,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getViewExtensionDescription_Identifier() {
@@ -170,7 +166,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EReference getViewExtensionDescription_Metamodels() {
@@ -178,7 +175,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EReference getViewExtensionDescription_Pages() {
@@ -186,7 +184,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EReference getViewExtensionDescription_DefaultPage() {
@@ -194,31 +193,26 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getViewExtensionDescription_PreconditionExpression() {
-        return (EAttribute)viewExtensionDescriptionEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getViewExtensionDescription_LabelExpression() {
-        return (EAttribute)viewExtensionDescriptionEClass.getEStructuralFeatures().get(5);
+        return (EAttribute)viewExtensionDescriptionEClass.getEStructuralFeatures().get(4);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EReference getViewExtensionDescription_Groups() {
-        return (EReference)viewExtensionDescriptionEClass.getEStructuralFeatures().get(6);
+        return (EReference)viewExtensionDescriptionEClass.getEStructuralFeatures().get(5);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EClass getPageDescription() {
@@ -226,7 +220,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getPageDescription_Identifier() {
@@ -234,7 +229,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getPageDescription_LabelExpression() {
@@ -242,7 +238,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getPageDescription_DomainClass() {
@@ -250,7 +247,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getPageDescription_SemanticCandidateExpression() {
@@ -258,7 +256,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EReference getPageDescription_Groups() {
@@ -266,7 +265,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EClass getGroupDescription() {
@@ -274,7 +274,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getGroupDescription_Identifier() {
@@ -282,7 +283,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getGroupDescription_LabelExpression() {
@@ -290,7 +292,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getGroupDescription_DomainClass() {
@@ -298,7 +301,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getGroupDescription_SemanticCandidateExpression() {
@@ -306,7 +310,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EReference getGroupDescription_Container() {
@@ -314,7 +319,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EClass getContainerDescription() {
@@ -322,7 +328,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getContainerDescription_Identifier() {
@@ -330,7 +337,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EReference getContainerDescription_Widgets() {
@@ -338,7 +346,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EClass getWidgetDescription() {
@@ -346,7 +355,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getWidgetDescription_Identifier() {
@@ -354,7 +364,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getWidgetDescription_LabelExpression() {
@@ -362,15 +373,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWidgetDescription_DomainCandidatesExpression() {
-        return (EAttribute)widgetDescriptionEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EClass getTextDescription() {
@@ -378,7 +382,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EAttribute getTextDescription_ValueExpression() {
@@ -386,7 +391,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EReference getTextDescription_InitialOperation() {
@@ -394,79 +400,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getCheckboxDescription() {
-        return checkboxDescriptionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCheckboxDescription_ValueExpression() {
-        return (EAttribute)checkboxDescriptionEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getCheckboxDescription_InitialOperation() {
-        return (EReference)checkboxDescriptionEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getSelectDescription() {
-        return selectDescriptionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getSelectDescription_ValueExpression() {
-        return (EAttribute)selectDescriptionEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getSelectDescription_InitialOperation() {
-        return (EReference)selectDescriptionEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getSelectDescription_Multiple() {
-        return (EAttribute)selectDescriptionEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getSelectDescription_CandidatesExpression() {
-        return (EAttribute)selectDescriptionEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getSelectDescription_CandidateDisplayExpression() {
-        return (EAttribute)selectDescriptionEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PropertiesFactory getPropertiesFactory() {
@@ -474,7 +409,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private boolean isCreated = false;
@@ -496,7 +432,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         createEReference(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__METAMODELS);
         createEReference(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__PAGES);
         createEReference(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE);
-        createEAttribute(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION);
         createEAttribute(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION);
         createEReference(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__GROUPS);
 
@@ -521,35 +456,24 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         widgetDescriptionEClass = createEClass(WIDGET_DESCRIPTION);
         createEAttribute(widgetDescriptionEClass, WIDGET_DESCRIPTION__IDENTIFIER);
         createEAttribute(widgetDescriptionEClass, WIDGET_DESCRIPTION__LABEL_EXPRESSION);
-        createEAttribute(widgetDescriptionEClass, WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION);
 
         textDescriptionEClass = createEClass(TEXT_DESCRIPTION);
         createEAttribute(textDescriptionEClass, TEXT_DESCRIPTION__VALUE_EXPRESSION);
         createEReference(textDescriptionEClass, TEXT_DESCRIPTION__INITIAL_OPERATION);
-
-        checkboxDescriptionEClass = createEClass(CHECKBOX_DESCRIPTION);
-        createEAttribute(checkboxDescriptionEClass, CHECKBOX_DESCRIPTION__VALUE_EXPRESSION);
-        createEReference(checkboxDescriptionEClass, CHECKBOX_DESCRIPTION__INITIAL_OPERATION);
-
-        selectDescriptionEClass = createEClass(SELECT_DESCRIPTION);
-        createEAttribute(selectDescriptionEClass, SELECT_DESCRIPTION__VALUE_EXPRESSION);
-        createEReference(selectDescriptionEClass, SELECT_DESCRIPTION__INITIAL_OPERATION);
-        createEAttribute(selectDescriptionEClass, SELECT_DESCRIPTION__MULTIPLE);
-        createEAttribute(selectDescriptionEClass, SELECT_DESCRIPTION__CANDIDATES_EXPRESSION);
-        createEAttribute(selectDescriptionEClass, SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     private boolean isInitialized = false;
 
     /**
-     * Complete the initialization of the package and its meta-model. This
-     * method is guarded to have no affect on any invocation but its first. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Complete the initialization of the package and its meta-model.  This
+     * method is guarded to have no affect on any invocation but its first.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void initializePackageContents() {
@@ -564,7 +488,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         // Obtain other dependent packages
         DescriptionPackage theDescriptionPackage = (DescriptionPackage)EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
         EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-        ExpressionPackage theExpressionPackage = (ExpressionPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI);
         ToolPackage theToolPackage = (ToolPackage)EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI);
 
         // Create type parameters
@@ -574,8 +497,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         // Add supertypes to classes
         viewExtensionDescriptionEClass.getESuperTypes().add(theDescriptionPackage.getExtension());
         textDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
-        checkboxDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
-        selectDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
 
         // Initialize classes and features; add operations and parameters
         initEClass(viewExtensionDescriptionEClass, ViewExtensionDescription.class, "ViewExtensionDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -583,22 +504,21 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getViewExtensionDescription_Metamodels(), theEcorePackage.getEPackage(), null, "metamodels", null, 0, -1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getViewExtensionDescription_Pages(), this.getPageDescription(), null, "pages", null, 0, -1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getViewExtensionDescription_DefaultPage(), this.getPageDescription(), null, "defaultPage", null, 0, 1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getViewExtensionDescription_PreconditionExpression(), theExpressionPackage.getExpression(), "preconditionExpression", null, 0, 1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getViewExtensionDescription_LabelExpression(), theExpressionPackage.getExpression(), "labelExpression", null, 0, 1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getViewExtensionDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getViewExtensionDescription_Groups(), this.getGroupDescription(), null, "groups", null, 0, -1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(pageDescriptionEClass, PageDescription.class, "PageDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getPageDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPageDescription_LabelExpression(), theExpressionPackage.getExpression(), "labelExpression", null, 0, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getPageDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getPageDescription_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 0, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPageDescription_SemanticCandidateExpression(), theExpressionPackage.getExpression(), "semanticCandidateExpression", null, 0, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getPageDescription_SemanticCandidateExpression(), theDescriptionPackage.getInterpretedExpression(), "semanticCandidateExpression", null, 0, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getPageDescription_Groups(), this.getGroupDescription(), null, "groups", null, 0, -1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(groupDescriptionEClass, GroupDescription.class, "GroupDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getGroupDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getGroupDescription_LabelExpression(), theExpressionPackage.getExpression(), "labelExpression", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getGroupDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getGroupDescription_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getGroupDescription_SemanticCandidateExpression(), theExpressionPackage.getExpression(), "semanticCandidateExpression", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getGroupDescription_SemanticCandidateExpression(), theDescriptionPackage.getInterpretedExpression(), "semanticCandidateExpression", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getGroupDescription_Container(), this.getContainerDescription(), null, "container", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(containerDescriptionEClass, ContainerDescription.class, "ContainerDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -607,26 +527,14 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
         initEClass(widgetDescriptionEClass, WidgetDescription.class, "WidgetDescription", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getWidgetDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, WidgetDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWidgetDescription_LabelExpression(), theExpressionPackage.getExpression(), "labelExpression", null, 0, 1, WidgetDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWidgetDescription_DomainCandidatesExpression(), theExpressionPackage.getExpression(), "domainCandidatesExpression", null, 0, 1, WidgetDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getWidgetDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, WidgetDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(textDescriptionEClass, TextDescription.class, "TextDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTextDescription_ValueExpression(), theExpressionPackage.getExpression(), "valueExpression", null, 0, 1, TextDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTextDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, TextDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getTextDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, TextDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(checkboxDescriptionEClass, CheckboxDescription.class, "CheckboxDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCheckboxDescription_ValueExpression(), theExpressionPackage.getExpression(), "valueExpression", null, 0, 1, CheckboxDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getCheckboxDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, CheckboxDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(selectDescriptionEClass, SelectDescription.class, "SelectDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSelectDescription_ValueExpression(), theExpressionPackage.getExpression(), "valueExpression", null, 0, 1, SelectDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getSelectDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, SelectDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getSelectDescription_Multiple(), ecorePackage.getEBoolean(), "multiple", null, 0, 1, SelectDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getSelectDescription_CandidatesExpression(), theExpressionPackage.getExpression(), "candidatesExpression", null, 0, 1, SelectDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getSelectDescription_CandidateDisplayExpression(), theExpressionPackage.getExpression(), "candidateDisplayExpression", null, 0, 1, SelectDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
         // Create resource
         createResource(eNS_URI);
     }
 
-} // PropertiesPackageImpl
+} //PropertiesPackageImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
deleted file mode 100644
index 43f59381bc..0000000000
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/**
- * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Obeo - initial API and implementation
- * 
- */
-package org.eclipse.sirius.properties.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.SelectDescription;
-import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Select Description</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getInitialOperation <em>Initial Operation</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#isMultiple <em>Multiple</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getCandidatesExpression <em>Candidates Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getCandidateDisplayExpression <em>Candidate Display Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SelectDescriptionImpl extends WidgetDescriptionImpl implements SelectDescription {
-    /**
-     * The default value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @see #getValueExpression()
-     * @generated
-     * @ordered
-     */
-    protected static final String VALUE_EXPRESSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @see #getValueExpression()
-     * @generated
-     * @ordered
-     */
-    protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getInitialOperation() <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @see #getInitialOperation()
-     * @generated
-     * @ordered
-     */
-    protected InitialOperation initialOperation;
-
-    /**
-     * The default value of the '{@link #isMultiple() <em>Multiple</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see #isMultiple()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean MULTIPLE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isMultiple() <em>Multiple</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see #isMultiple()
-     * @generated
-     * @ordered
-     */
-    protected boolean multiple = MULTIPLE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getCandidatesExpression() <em>Candidates Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @see #getCandidatesExpression()
-     * @generated
-     * @ordered
-     */
-    protected static final String CANDIDATES_EXPRESSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCandidatesExpression() <em>Candidates Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @see #getCandidatesExpression()
-     * @generated
-     * @ordered
-     */
-    protected String candidatesExpression = CANDIDATES_EXPRESSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getCandidateDisplayExpression() <em>Candidate Display Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @see #getCandidateDisplayExpression()
-     * @generated
-     * @ordered
-     */
-    protected static final String CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCandidateDisplayExpression() <em>Candidate Display Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @see #getCandidateDisplayExpression()
-     * @generated
-     * @ordered
-     */
-    protected String candidateDisplayExpression = CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected SelectDescriptionImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return PropertiesPackage.Literals.SELECT_DESCRIPTION;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public String getValueExpression() {
-        return valueExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setValueExpression(String newValueExpression) {
-        String oldValueExpression = valueExpression;
-        valueExpression = newValueExpression;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION, oldValueExpression, valueExpression));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public InitialOperation getInitialOperation() {
-        return initialOperation;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
-        InitialOperation oldInitialOperation = initialOperation;
-        initialOperation = newInitialOperation;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, oldInitialOperation, newInitialOperation);
-            if (msgs == null) msgs = notification; else msgs.add(notification);
-        }
-        return msgs;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setInitialOperation(InitialOperation newInitialOperation) {
-        if (newInitialOperation != initialOperation) {
-            NotificationChain msgs = null;
-            if (initialOperation != null)
-                msgs = ((InternalEObject)initialOperation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
-            if (newInitialOperation != null)
-                msgs = ((InternalEObject)newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
-            msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isMultiple() {
-        return multiple;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setMultiple(boolean newMultiple) {
-        boolean oldMultiple = multiple;
-        multiple = newMultiple;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__MULTIPLE, oldMultiple, multiple));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCandidatesExpression() {
-        return candidatesExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCandidatesExpression(String newCandidatesExpression) {
-        String oldCandidatesExpression = candidatesExpression;
-        candidatesExpression = newCandidatesExpression;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION, oldCandidatesExpression, candidatesExpression));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCandidateDisplayExpression() {
-        return candidateDisplayExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCandidateDisplayExpression(String newCandidateDisplayExpression) {
-        String oldCandidateDisplayExpression = candidateDisplayExpression;
-        candidateDisplayExpression = newCandidateDisplayExpression;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION, oldCandidateDisplayExpression, candidateDisplayExpression));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                return basicSetInitialOperation(null, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-                return getValueExpression();
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                return getInitialOperation();
-            case PropertiesPackage.SELECT_DESCRIPTION__MULTIPLE:
-                return isMultiple();
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-                return getCandidatesExpression();
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                return getCandidateDisplayExpression();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression((String)newValue);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)newValue);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__MULTIPLE:
-                setMultiple((Boolean)newValue);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-                setCandidatesExpression((String)newValue);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                setCandidateDisplayExpression((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression(VALUE_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)null);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__MULTIPLE:
-                setMultiple(MULTIPLE_EDEFAULT);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-                setCandidatesExpression(CANDIDATES_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                setCandidateDisplayExpression(CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-                return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                return initialOperation != null;
-            case PropertiesPackage.SELECT_DESCRIPTION__MULTIPLE:
-                return multiple != MULTIPLE_EDEFAULT;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-                return CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                return CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT.equals(candidateDisplayExpression);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (valueExpression: ");
-        result.append(valueExpression);
-        result.append(", multiple: ");
-        result.append(multiple);
-        result.append(", candidatesExpression: ");
-        result.append(candidatesExpression);
-        result.append(", candidateDisplayExpression: ");
-        result.append(candidateDisplayExpression);
-        result.append(')');
-        return result.toString();
-    }
-
-} // SelectDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
index 95fefedd22..28e84241b8 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
@@ -13,16 +13,21 @@ package org.eclipse.sirius.properties.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.TextDescription;
+
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Text Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Text Description</b></em>'.
+ * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
@@ -36,8 +41,8 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDescription {
     /**
      * The default value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -46,8 +51,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * The cached value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -56,8 +61,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * The cached value of the '{@link #getInitialOperation() <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -65,7 +70,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     protected InitialOperation initialOperation;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected TextDescriptionImpl() {
@@ -73,7 +79,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -82,7 +89,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getValueExpression() {
@@ -90,7 +98,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setValueExpression(String newValueExpression) {
@@ -101,7 +110,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public InitialOperation getInitialOperation() {
@@ -109,7 +119,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -123,7 +134,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setInitialOperation(InitialOperation newInitialOperation) {
@@ -141,7 +153,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -154,7 +167,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -169,7 +183,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -186,7 +201,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -203,7 +219,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -218,7 +235,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -232,4 +250,4 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
         return result.toString();
     }
 
-} // TextDescriptionImpl
+} //TextDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
index c41c27b4e7..d9d6a38f08 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
@@ -15,23 +15,29 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>View Extension Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>View Extension Description</b></em>'.
+ * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
@@ -39,7 +45,6 @@ import org.eclipse.sirius.properties.ViewExtensionDescription;
  *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getMetamodels <em>Metamodels</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getPages <em>Pages</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getDefaultPage <em>Default Page</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getPreconditionExpression <em>Precondition Expression</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getGroups <em>Groups</em>}</li>
  * </ul>
@@ -50,7 +55,8 @@ import org.eclipse.sirius.properties.ViewExtensionDescription;
 public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container implements ViewExtensionDescription {
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -59,7 +65,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -68,7 +75,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getMetamodels()
      * @generated
      * @ordered
@@ -77,7 +85,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * The cached value of the '{@link #getPages() <em>Pages</em>}' containment reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getPages()
      * @generated
      * @ordered
@@ -86,37 +95,18 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * The cached value of the '{@link #getDefaultPage() <em>Default Page</em>}' reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see #getDefaultPage()
-     * @generated
-     * @ordered
-     */
-    protected PageDescription defaultPage;
-
-    /**
-     * The default value of the '{@link #getPreconditionExpression() <em>Precondition Expression</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getPreconditionExpression()
+     * @see #getDefaultPage()
      * @generated
      * @ordered
      */
-    protected static final String PRECONDITION_EXPRESSION_EDEFAULT = null;
+    protected PageDescription defaultPage;
 
     /**
-     * The cached value of the '{@link #getPreconditionExpression() <em>Precondition Expression</em>}' attribute.
+     * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getPreconditionExpression()
-     * @generated
-     * @ordered
-     */
-    protected String preconditionExpression = PRECONDITION_EXPRESSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -125,8 +115,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -135,7 +125,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * The cached value of the '{@link #getGroups() <em>Groups</em>}' containment reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getGroups()
      * @generated
      * @ordered
@@ -143,7 +134,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected EList<GroupDescription> groups;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected ViewExtensionDescriptionImpl() {
@@ -151,7 +143,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -160,7 +153,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getIdentifier() {
@@ -168,7 +162,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -179,7 +174,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EList<EPackage> getMetamodels() {
@@ -190,7 +186,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EList<PageDescription> getPages() {
@@ -201,7 +198,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PageDescription getDefaultPage() {
@@ -217,7 +215,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PageDescription basicGetDefaultPage() {
@@ -225,7 +224,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setDefaultPage(PageDescription newDefaultPage) {
@@ -236,26 +236,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public String getPreconditionExpression() {
-        return preconditionExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setPreconditionExpression(String newPreconditionExpression) {
-        String oldPreconditionExpression = preconditionExpression;
-        preconditionExpression = newPreconditionExpression;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION, oldPreconditionExpression, preconditionExpression));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getLabelExpression() {
@@ -263,7 +245,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setLabelExpression(String newLabelExpression) {
@@ -274,7 +257,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public EList<GroupDescription> getGroups() {
@@ -285,7 +269,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -300,7 +285,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -315,8 +301,6 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
                 if (resolve) return getDefaultPage();
                 return basicGetDefaultPage();
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION:
-                return getPreconditionExpression();
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
                 return getLabelExpression();
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
@@ -326,7 +310,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -347,9 +332,6 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
                 setDefaultPage((PageDescription)newValue);
                 return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION:
-                setPreconditionExpression((String)newValue);
-                return;
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
                 setLabelExpression((String)newValue);
                 return;
@@ -362,7 +344,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -380,9 +363,6 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
                 setDefaultPage((PageDescription)null);
                 return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION:
-                setPreconditionExpression(PRECONDITION_EXPRESSION_EDEFAULT);
-                return;
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
                 setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
                 return;
@@ -394,7 +374,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -408,8 +389,6 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
                 return pages != null && !pages.isEmpty();
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
                 return defaultPage != null;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PRECONDITION_EXPRESSION:
-                return PRECONDITION_EXPRESSION_EDEFAULT == null ? preconditionExpression != null : !PRECONDITION_EXPRESSION_EDEFAULT.equals(preconditionExpression);
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
                 return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
             case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
@@ -419,7 +398,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -429,12 +409,10 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
         result.append(identifier);
-        result.append(", preconditionExpression: ");
-        result.append(preconditionExpression);
         result.append(", labelExpression: ");
         result.append(labelExpression);
         result.append(')');
         return result.toString();
     }
 
-} // ViewExtensionDescriptionImpl
+} //ViewExtensionDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
index f7c5815356..b1adba2abe 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
@@ -12,21 +12,24 @@
 package org.eclipse.sirius.properties.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.WidgetDescription;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Widget Description</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Widget Description</b></em>'.
+ * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getIdentifier <em>Identifier</em>}</li>
  *   <li>{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getDomainCandidatesExpression <em>Domain Candidates Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -35,7 +38,8 @@ import org.eclipse.sirius.properties.WidgetDescription;
 public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container implements WidgetDescription {
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -44,7 +48,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -53,8 +58,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -63,8 +68,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -72,27 +77,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getDomainCandidatesExpression() <em>Domain Candidates Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @see #getDomainCandidatesExpression()
-     * @generated
-     * @ordered
-     */
-    protected static final String DOMAIN_CANDIDATES_EXPRESSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getDomainCandidatesExpression() <em>Domain Candidates Expression</em>}' attribute.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @see #getDomainCandidatesExpression()
-     * @generated
-     * @ordered
-     */
-    protected String domainCandidatesExpression = DOMAIN_CANDIDATES_EXPRESSION_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected WidgetDescriptionImpl() {
@@ -100,7 +86,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -109,7 +96,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getIdentifier() {
@@ -117,7 +105,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -128,7 +117,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public String getLabelExpression() {
@@ -136,7 +126,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public void setLabelExpression(String newLabelExpression) {
@@ -147,26 +138,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public String getDomainCandidatesExpression() {
-        return domainCandidatesExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public void setDomainCandidatesExpression(String newDomainCandidatesExpression) {
-        String oldDomainCandidatesExpression = domainCandidatesExpression;
-        domainCandidatesExpression = newDomainCandidatesExpression;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION, oldDomainCandidatesExpression, domainCandidatesExpression));
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -176,14 +149,13 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
                 return getIdentifier();
             case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
                 return getLabelExpression();
-            case PropertiesPackage.WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION:
-                return getDomainCandidatesExpression();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -195,15 +167,13 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
             case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
                 setLabelExpression((String)newValue);
                 return;
-            case PropertiesPackage.WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION:
-                setDomainCandidatesExpression((String)newValue);
-                return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -215,15 +185,13 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
             case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
                 setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
                 return;
-            case PropertiesPackage.WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION:
-                setDomainCandidatesExpression(DOMAIN_CANDIDATES_EXPRESSION_EDEFAULT);
-                return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -233,14 +201,13 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
                 return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
             case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
                 return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
-            case PropertiesPackage.WIDGET_DESCRIPTION__DOMAIN_CANDIDATES_EXPRESSION:
-                return DOMAIN_CANDIDATES_EXPRESSION_EDEFAULT == null ? domainCandidatesExpression != null : !DOMAIN_CANDIDATES_EXPRESSION_EDEFAULT.equals(domainCandidatesExpression);
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -252,10 +219,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
         result.append(identifier);
         result.append(", labelExpression: ");
         result.append(labelExpression);
-        result.append(", domainCandidatesExpression: ");
-        result.append(domainCandidatesExpression);
         result.append(')');
         return result.toString();
     }
 
-} // WidgetDescriptionImpl
+} //WidgetDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
index a12036fec3..d1624f4817 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
@@ -13,38 +13,36 @@ package org.eclipse.sirius.properties.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.properties.CheckboxDescription;
-import org.eclipse.sirius.properties.ContainerDescription;
-import org.eclipse.sirius.properties.GroupDescription;
-import org.eclipse.sirius.properties.PageDescription;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.SelectDescription;
-import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.ViewExtensionDescription;
-import org.eclipse.sirius.properties.WidgetDescription;
+
+import org.eclipse.sirius.properties.*;
+
 import org.eclipse.sirius.viewpoint.description.Extension;
 
 /**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
- * an adapter <code>createXXX</code> method for each class of the model. <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
 public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     /**
      * The cached model package.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected static PropertiesPackage modelPackage;
 
     /**
      * Creates an instance of the adapter factory.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PropertiesAdapterFactory() {
@@ -55,9 +53,9 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Returns whether this factory is applicable for the type of the object.
-     * <!-- begin-user-doc --> This implementation returns <code>true</code> if
-     * the object is either the model's package or is an instance object of the
-     * model. <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+     * <!-- end-user-doc -->
      * @return whether this factory is applicable for the type of the object.
      * @generated
      */
@@ -73,12 +71,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * The switch that delegates to the <code>createXXX</code> methods. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The switch that delegates to the <code>createXXX</code> methods.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    protected PropertiesSwitch<Adapter> modelSwitch = new PropertiesSwitch<Adapter>() {
+    protected PropertiesSwitch<Adapter> modelSwitch =
+        new PropertiesSwitch<Adapter>() {
             @Override
             public Adapter caseViewExtensionDescription(ViewExtensionDescription object) {
                 return createViewExtensionDescriptionAdapter();
@@ -104,14 +103,6 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
                 return createTextDescriptionAdapter();
             }
             @Override
-            public Adapter caseCheckboxDescription(CheckboxDescription object) {
-                return createCheckboxDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseSelectDescription(SelectDescription object) {
-                return createSelectDescriptionAdapter();
-            }
-            @Override
             public Adapter caseExtension(Extension object) {
                 return createExtensionAdapter();
             }
@@ -134,12 +125,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         return modelSwitch.doSwitch((EObject)target);
     }
 
+
     /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.ViewExtensionDescription <em>View Extension Description</em>}'.
-     * <!-- begin-user-doc --> This
-     * default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases
-     * anyway. <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
      * @return the new adapter.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription
      * @generated
@@ -150,9 +142,9 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.PageDescription <em>Page Description</em>}'.
-     * <!-- begin-user-doc --> This default
-     * implementation returns null so that we can easily ignore cases; it's
-     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
      * @see org.eclipse.sirius.properties.PageDescription
@@ -164,9 +156,9 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.GroupDescription <em>Group Description</em>}'.
-     * <!-- begin-user-doc --> This default
-     * implementation returns null so that we can easily ignore cases; it's
-     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
      * @see org.eclipse.sirius.properties.GroupDescription
@@ -178,9 +170,9 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.ContainerDescription <em>Container Description</em>}'.
-     * <!-- begin-user-doc --> This default
-     * implementation returns null so that we can easily ignore cases; it's
-     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
      * @see org.eclipse.sirius.properties.ContainerDescription
@@ -192,9 +184,9 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.WidgetDescription <em>Widget Description</em>}'.
-     * <!-- begin-user-doc --> This default
-     * implementation returns null so that we can easily ignore cases; it's
-     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
      * @see org.eclipse.sirius.properties.WidgetDescription
@@ -206,9 +198,9 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.TextDescription <em>Text Description</em>}'.
-     * <!-- begin-user-doc --> This default
-     * implementation returns null so that we can easily ignore cases; it's
-     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
      * @see org.eclipse.sirius.properties.TextDescription
@@ -219,42 +211,12 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.CheckboxDescription <em>Checkbox Description</em>}'.
-     * <!-- begin-user-doc --> This default
-     * implementation returns null so that we can easily ignore cases; it's
-     * useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.sirius.properties.CheckboxDescription
-     * @generated
-     */
-    public Adapter createCheckboxDescriptionAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.SelectDescription <em>Select Description</em>}'.
-     * <!-- begin-user-doc --> This default
-     * implementation returns null so that we can easily ignore cases; it's
-     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.description.Extension <em>Extension</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * @return the new adapter.
-     * @see org.eclipse.sirius.properties.SelectDescription
-     * @generated
-     */
-    public Adapter createSelectDescriptionAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.Extension
-     * <em>Extension</em>}'. <!-- begin-user-doc --> This default implementation
-     * returns null so that we can easily ignore cases; it's useful to ignore a
-     * case when inheritance will catch all the cases anyway. <!-- end-user-doc
-     * -->
-     * 
-     * @return the new adapter.
      * @see org.eclipse.sirius.viewpoint.description.Extension
      * @generated
      */
@@ -264,8 +226,9 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for the default case.
-     * <!-- begin-user-doc --> This
-     * default implementation returns null. <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This default implementation returns null.
+     * <!-- end-user-doc -->
      * @return the new adapter.
      * @generated
      */
@@ -273,4 +236,4 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         return null;
     }
 
-} // PropertiesAdapterFactory
+} //PropertiesAdapterFactory
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
index c35bd4e4c3..3bce2f8887 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
@@ -12,41 +12,40 @@
 package org.eclipse.sirius.properties.util;
 
 import java.util.List;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.properties.CheckboxDescription;
-import org.eclipse.sirius.properties.ContainerDescription;
-import org.eclipse.sirius.properties.GroupDescription;
-import org.eclipse.sirius.properties.PageDescription;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.SelectDescription;
-import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.ViewExtensionDescription;
-import org.eclipse.sirius.properties.WidgetDescription;
+
+import org.eclipse.sirius.properties.*;
+
 import org.eclipse.sirius.viewpoint.description.Extension;
 
 /**
- * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
  * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object and proceeding up the
- * inheritance hierarchy until a non-null result is returned, which is the
- * result of the switch. <!-- end-user-doc -->
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
 public class PropertiesSwitch<T> {
     /**
      * The cached model package
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected static PropertiesPackage modelPackage;
 
     /**
      * Creates an instance of the switch.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public PropertiesSwitch() {
@@ -57,8 +56,8 @@ public class PropertiesSwitch<T> {
 
     /**
      * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the first non-null result returned by a <code>caseXXX</code> call.
      * @generated
      */
@@ -68,8 +67,8 @@ public class PropertiesSwitch<T> {
 
     /**
      * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the first non-null result returned by a <code>caseXXX</code> call.
      * @generated
      */
@@ -88,8 +87,8 @@ public class PropertiesSwitch<T> {
 
     /**
      * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @return the first non-null result returned by a <code>caseXXX</code> call.
      * @generated
      */
@@ -133,29 +132,16 @@ public class PropertiesSwitch<T> {
                 if (result == null) result = defaultCase(theEObject);
                 return result;
             }
-            case PropertiesPackage.CHECKBOX_DESCRIPTION: {
-                CheckboxDescription checkboxDescription = (CheckboxDescription)theEObject;
-                T result = caseCheckboxDescription(checkboxDescription);
-                if (result == null) result = caseWidgetDescription(checkboxDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.SELECT_DESCRIPTION: {
-                SelectDescription selectDescription = (SelectDescription)theEObject;
-                T result = caseSelectDescription(selectDescription);
-                if (result == null) result = caseWidgetDescription(selectDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
             default: return defaultCase(theEObject);
         }
     }
 
     /**
      * Returns the result of interpreting the object as an instance of '<em>View Extension Description</em>'.
-     * <!-- begin-user-doc --> This
-     * implementation returns null; returning a non-null result will terminate
-     * the switch. <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
      * @param object the target of the switch.
      * @return the result of interpreting the object as an instance of '<em>View Extension Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -167,9 +153,10 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '<em>Page Description</em>'.
-     * <!-- begin-user-doc --> This implementation
-     * returns null; returning a non-null result will terminate the switch. <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
      * @param object the target of the switch.
      * @return the result of interpreting the object as an instance of '<em>Page Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -181,9 +168,10 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '<em>Group Description</em>'.
-     * <!-- begin-user-doc --> This implementation
-     * returns null; returning a non-null result will terminate the switch. <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
      * @param object the target of the switch.
      * @return the result of interpreting the object as an instance of '<em>Group Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -195,9 +183,10 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '<em>Container Description</em>'.
-     * <!-- begin-user-doc --> This
-     * implementation returns null; returning a non-null result will terminate
-     * the switch. <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
      * @param object the target of the switch.
      * @return the result of interpreting the object as an instance of '<em>Container Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -209,9 +198,10 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '<em>Widget Description</em>'.
-     * <!-- begin-user-doc --> This implementation
-     * returns null; returning a non-null result will terminate the switch. <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
      * @param object the target of the switch.
      * @return the result of interpreting the object as an instance of '<em>Widget Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -223,9 +213,10 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '<em>Text Description</em>'.
-     * <!-- begin-user-doc --> This implementation
-     * returns null; returning a non-null result will terminate the switch. <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
      * @param object the target of the switch.
      * @return the result of interpreting the object as an instance of '<em>Text Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -236,38 +227,11 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Checkbox Description</em>'.
-     * <!-- begin-user-doc --> This
-     * implementation returns null; returning a non-null result will terminate
-     * the switch. <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Checkbox Description</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseCheckboxDescription(CheckboxDescription object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Select Description</em>'.
-     * <!-- begin-user-doc --> This implementation
-     * returns null; returning a non-null result will terminate the switch. <!--
-     * end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Select Description</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseSelectDescription(SelectDescription object) {
-        return null;
-    }
-
-    /**
      * Returns the result of interpreting the object as an instance of '<em>Extension</em>'.
-     * <!-- begin-user-doc --> This implementation returns
-     * null; returning a non-null result will terminate the switch. <!--
-     * end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
      * @param object the target of the switch.
      * @return the result of interpreting the object as an instance of '<em>Extension</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -279,9 +243,10 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-     * <!-- begin-user-doc --> This implementation returns
-     * null; returning a non-null result will terminate the switch, but this is
-     * the last case anyway. <!-- end-user-doc -->
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch, but this is the last case anyway.
+     * <!-- end-user-doc -->
      * @param object the target of the switch.
      * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject)
@@ -291,4 +256,4 @@ public class PropertiesSwitch<T> {
         return null;
     }
 
-} // PropertiesSwitch
+} //PropertiesSwitch
diff --git a/incubation/org.eclipse.sirius.sample.properties/description/project.odesign b/incubation/org.eclipse.sirius.sample.properties/description/project.odesign
index 40559c5016..a2326cc0d9 100644
--- a/incubation/org.eclipse.sirius.sample.properties/description/project.odesign
+++ b/incubation/org.eclipse.sirius.sample.properties/description/project.odesign
@@ -9,7 +9,7 @@
     xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"
     xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0"
     name="project"
-    version="10.1.0.201507271600">
+    version="11.0.0.201511131800">
   <ownedViewpoints
       name="Design">
     <ownedRepresentations
@@ -85,17 +85,17 @@
       xsi:type="properties:ViewExtensionDescription"
       identifier="Properties"
       defaultPage="//@extensions.0/@pages.0"
-      preconditionExpression=""
-      labelExpression="aql:viewSemanticCandidate.name">
+      labelExpression="aql:self.name"
+      preconditionExpression="">
     <pages identifier="PageOne"
-        labelExpression="feature:name"
+        labelExpression="aql:'General'"
         domainClass="ecore.EAttribute"
         semanticCandidateExpression=""/>
     <pages identifier="PageTwo"
-        labelExpression="feature:name"
+        labelExpression="aql:'Semantic'"
         domainClass="ecore.EReference"/>
     <pages identifier="PageThree"
-        labelExpression="feature:name"
+        labelExpression="aql:'Documentation'"
         domainClass="ecore.EClass"/>
     <groups
         identifier="GroupOne"
@@ -111,126 +111,7 @@
             <firstModelOperations
                 xsi:type="tool:SetValue"
                 featureName="name"
-                valueExpression="aql:newValue + 'toto'"/>
-          </initialOperation>
-        </widgets>
-      </container>
-    </groups>
-    <groups
-        identifier="GroupTwo"
-        labelExpression="EStructuralFeature"
-        domainClass="ecore.EStructuralFeature">
-      <container>
-        <widgets
-            xsi:type="properties:TextDescription"
-            labelExpression="UpperBound"
-            valueExpression="feature:upperBound">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:SetValue"
-                featureName="upperBound"
-                valueExpression="var:newValue"/>
-          </initialOperation>
-        </widgets>
-      </container>
-    </groups>
-    <groups
-        identifier="GroupThree"
-        labelExpression="EAttribute"
-        domainClass="ecore.EAttribute">
-      <container
-          identifier="">
-        <widgets
-            xsi:type="properties:SelectDescription"
-            labelExpression="Type"
-            domainCandidatesExpression=""
-            valueExpression="feature:eType"
-            candidatesExpression="aql:ecore.EDatatype.eAllInstances()"
-            candidateDisplayExpression="feature:name">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:SetValue"
-                featureName="eType"
-                valueExpression="var:newValue"/>
-          </initialOperation>
-        </widgets>
-      </container>
-    </groups>
-    <groups
-        identifier="GroupFour"
-        labelExpression="EReference"
-        domainClass="ecore.EReference">
-      <container>
-        <widgets
-            xsi:type="properties:SelectDescription"
-            labelExpression="Type"
-            domainCandidatesExpression=""
-            valueExpression="feature:eType"
-            candidatesExpression="aql:ecore.EClass.eAllInstances()"
-            candidateDisplayExpression="feature:name">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:SetValue"
-                featureName="eType"
-                valueExpression="var:newValue"/>
-          </initialOperation>
-        </widgets>
-      </container>
-    </groups>
-    <groups
-        identifier="GroupFive"
-        labelExpression="EClass"
-        domainClass="ecore.EClass">
-      <container>
-        <widgets
-            xsi:type="properties:CheckboxDescription"
-            labelExpression="Abstract"
-            domainCandidatesExpression=""
-            valueExpression="feature:abstract">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:SetValue"
-                featureName="abstract"
-                valueExpression="var:newValue"/>
-          </initialOperation>
-        </widgets>
-      </container>
-    </groups>
-    <groups
-        identifier="GroupSix"
-        labelExpression="Advanced"
-        domainClass="ecore.EObject">
-      <container>
-        <widgets
-            xsi:type="properties:TextDescription"
-            labelExpression="aql:domainCandidate.name"
-            domainCandidatesExpression="domainClass.eStructuralFeatures->select(f|f.eType.name='EString')"
-            valueExpression="aql:self.eGet(domainCandidate)">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="aql:self.eSet(domainCandidate,newValue)"/>
-          </initialOperation>
-        </widgets>
-      </container>
-    </groups>
-    <groups
-        identifier="GroupSeven"
-        labelExpression="Documentation"
-        domainClass="ecore.EObject"
-        preconditionExpression="">
-      <propertyContextVariables
-          name="diagram"
-          propertyContext="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']"/>
-      <container>
-        <widgets
-            xsi:type="properties:TextDescription"
-            labelExpression="Documentation"
-            valueExpression="aql:self.getDocumentation()">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="aql:self.setDocumentation(newValue)"/>
+                valueExpression="aql:newValue"/>
           </initialOperation>
         </widgets>
       </container>
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusTabDescriptorProvider.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusTabDescriptorProvider.java
index 30daaf306d..56983a8f28 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusTabDescriptorProvider.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusTabDescriptorProvider.java
@@ -19,7 +19,7 @@ import org.eclipse.eef.core.api.EEFVariableManagerFactory;
 import org.eclipse.eef.core.api.EEFView;
 import org.eclipse.eef.core.api.EEFViewFactory;
 import org.eclipse.eef.core.api.IVariableManager;
-import org.eclipse.eef.ide.ui.internal.data.EEFTabDescriptor;
+import org.eclipse.eef.ide.ui.internal.properties.EEFTabDescriptor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -111,12 +111,11 @@ public class SiriusTabDescriptorProvider implements ITabDescriptorProvider {
                 EEFViewDescription eefViewDescription = this.convert(viewExtensionDescription);
 
                 IVariableManager variableManager = new EEFVariableManagerFactory().createVariableManager();
-                variableManager.put(EEFExpressionUtils.EEFView.VIEW_SEMANTIC_CANDIDATE, eObject);
-                variableManager.put("self", eObject);
+                variableManager.put(EEFExpressionUtils.SELF, eObject);
 
                 List<IInterpreterProvider> interpreterProviders = new ArrayList<IInterpreterProvider>();
                 interpreterProviders.add(new SiriusInterpreterProvider(session));
-                EEFView eefView = new EEFViewFactory().createEEFView(eefViewDescription, variableManager, interpreterProviders, session.getTransactionalEditingDomain());
+                EEFView eefView = new EEFViewFactory().createEEFView(eefViewDescription, variableManager, interpreterProviders, session.getTransactionalEditingDomain(), eObject);
                 List<ITabDescriptor> descriptors = new ArrayList<ITabDescriptor>();
 
                 List<EEFPage> eefPages = eefView.getPages();