Bug 580540: [ClassDiagram][LookAndFeel] move all contributions for tasks 559405, task 559406, task 558456  on org.eclipse.papyrus.incubation
 - This contribution contains the last version of the code for the 3 tasks
 - This contribution still uses the poms referencing the main papyrus git
 - This contribution will not be able to compile and to be distributed (update site) without changes

Change-Id: Iede6f816fdea7440b3eabd3b2bbbea9fd43cd4c7
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
diff --git a/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/.project b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/.project
new file mode 100755
index 0000000..4209caa
--- /dev/null
+++ b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/build.properties b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/build.properties
new file mode 100755
index 0000000..64f93a9
--- /dev/null
+++ b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/feature.properties b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/feature.properties
new file mode 100755
index 0000000..ac5cdcb
--- /dev/null
+++ b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/feature.properties
@@ -0,0 +1,30 @@
+###############################################################################
+# Copyright (c) 2020 CEA LIST and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+
+# "featureName" property - name of the feature
+featureName=Papyrus - UML Class Diagram Look and Feel Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Modeling Project 
+
+# description property - text of the "Feature Description"
+description=Container of UML Class Diagram Look and Feel Add-Ons.
+################ end of description property ##################################
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2020 CEA LIST.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
diff --git a/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/feature.xml b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/feature.xml
new file mode 100755
index 0000000..bcfdbf0
--- /dev/null
+++ b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/feature.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.diagram.clazz.lf.feature"
+      label="Papyrus - UML Class Diagram Look and Feel Feature"
+      version="0.7.0.qualifier"
+      provider-name="Eclipse Modeling Project"
+      license-feature="org.eclipse.license"
+      license-feature-version="2.0.2">
+
+   <description url="https://eclipse.org/papyrus/">
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/pom.xml b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/pom.xml
new file mode 100755
index 0000000..83ef2da
--- /dev/null
+++ b/lookAndFeel/features/org.eclipse.papyrus.uml.diagram.clazz.lf.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.lf.features</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.diagram.clazz.lf.feature</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.classpath b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.classpath
new file mode 100644
index 0000000..4d145c0
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_201]"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.project b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.project
new file mode 100644
index 0000000..e7ab794
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.core.resources.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..896a9a5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.core.runtime.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..74c6d08
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,297 @@
+eclipse.preferences.version=1
+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.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+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.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+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=260
+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=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+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=260
+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=5
+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=false
+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
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.jdt.ui.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..ba7542e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+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\="true" 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 */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\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) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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 * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" 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}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${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=true
+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=true
+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=false
+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=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+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=true
+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=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+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=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_type_arguments=true
+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=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+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=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.pde.api.tools.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..b2260f8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Warning
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=Enabled
+changed_execution_env=Warning
+eclipse.preferences.version=1
+incompatible_api_component_version=Warning
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Error
+incompatible_api_component_version_report_minor_without_api_change=Error
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/META-INF/MANIFEST.MF b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1ae5b47
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Doc
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc.Activator
+Require-Bundle: org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-10
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc
+Bundle-ActivationPolicy: lazy
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/about.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/about.html
new file mode 100644
index 0000000..ef2872f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/about.html
@@ -0,0 +1,28 @@
+<!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>November 30, 2017</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 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/build.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/doc/Activator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/doc/Activator.java
new file mode 100644
index 0000000..3a89814
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/doc/Activator.java
@@ -0,0 +1,22 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/devDoc.mediawiki b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/devDoc.mediawiki
new file mode 100644
index 0000000..70904b2
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/devDoc.mediawiki
@@ -0,0 +1,27 @@
+= Overview =
+
+The following schema shows an overview of the implementation of the mechanism that layouts "properly" association end labels. 
+[[File:images/workingOverview.png|frame|none|Overview of the implementation]]
+
+As you can see, there are two entry points.
+
+The first one concerns the request to create the association. 
+
+The second one concerns its display.
+
+= Creating the association =
+
+When the user wants to create an association, a creation request is created. The EditPartProviders are asked to see if they have a factory for the type of element to create. Here, it is association and its ends. Our SelfLaidOutEditPartProvider will answer yes and will provide a factory. This factory will create special association*EditPart: SelfLaidOutAssociation*EditParts. This ones differ from the original ones because they display labels differently. 
+
+
+= Displaying the association =
+
+When Papyrus asks the association*EditParts to display (the association) a complex mechanism is fired. The only things that are interesting us here is the AssociationFigure and the Locators.
+
+The AssociationFigure creates the different labels and their textual content. We have created a SelfLaidOutAssociationFigure that specializes the original one by changing the labels and the locators. 
+The labels are now SelfLaidOutWrappingLabel and not simple PapyrusWrappingLabel anymore. The only difference here is the opaque white background in order that the label (over the link) will be clearly distinguishable.
+The Locators are now instances of classes that inherits from SelfLaidOutPapyrusLabelLocator. This one provides the basis to calculate the location of the label according the position of the last bending point and the associated element. As the location depends on the end (source or target) and on label (role or multiplicity) there are four different types of locators.
+
+== Calculation details ==
+
+To have more details on location calculation, please refer to the Javadoc of the classes SelfLaidOutPapyrusLabelLocation, AbstractSourceLabelLocator and AbstractTargetLabelLocator. The principle underlying the locating is essentially based on the calculation of the gradient, and on the condition that the label must not intersect the associated element.
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/layoutPrinciples.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/layoutPrinciples.png
new file mode 100644
index 0000000..00cce32
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/layoutPrinciples.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/someExamples.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/someExamples.png
new file mode 100644
index 0000000..c68e497
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/someExamples.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/workingOverview.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/workingOverview.png
new file mode 100644
index 0000000..9f4a96c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/images/workingOverview.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/userDoc.mediawiki b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/userDoc.mediawiki
new file mode 100644
index 0000000..08231c4
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.doc/src/site/mediawiki/userDoc.mediawiki
@@ -0,0 +1,15 @@
+= Automatic Layout for Association End Labels =
+
+This plug-in proposes to layout labels (role and multiplicity) of an association automatically and in a "proper" way.
+
+The figure below shows illustrates this label positioning performed by the plug-in with examples.
+
+[[File:images/someExamples.png|frame|none|Examples of label positioning]]
+
+== Underlying Principles ==
+
+The following schema explains how the end labels of an association are positioned. 
+
+First of all the labels role and multiplicity are displayed both, with the role first. We call this succession of the 2 labels, the full label. The full label is positioned a little bit behind the associated element (a class, a data type...). However, the center of the full label must be on the segment linked to the associated element (hence the gradient calculation). Finally, if the full label intersects the associated element, the full label is then shifted to the left or to the right by the "length" of this intersection.
+
+[[File:images/layoutPrinciples.png|frame|none|Layout Principles]]
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.classpath b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.classpath
new file mode 100644
index 0000000..80825de
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_201]"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.project b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.project
new file mode 100644
index 0000000..826dd20
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.core.resources.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..896a9a5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.core.runtime.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..74c6d08
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,297 @@
+eclipse.preferences.version=1
+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.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+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.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+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=260
+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=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+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=260
+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=5
+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=false
+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
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.jdt.ui.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..ba7542e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+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\="true" 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 */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\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) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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 * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" 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}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${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=true
+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=true
+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=false
+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=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+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=true
+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=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+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=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_type_arguments=true
+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=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+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=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.pde.api.tools.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..b2260f8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Warning
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=Enabled
+changed_execution_env=Warning
+eclipse.preferences.version=1
+incompatible_api_component_version=Warning
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Error
+incompatible_api_component_version_report_minor_without_api_change=Error
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/META-INF/MANIFEST.MF b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..2837e43
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/META-INF/MANIFEST.MF
@@ -0,0 +1,32 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Papyrus Class Diagram Enhanced Association Label Layout
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="3.101.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="4.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="2.3.0",
+ org.eclipse.papyrus.editor;bundle-version="2.0.0",
+ org.eclipse.papyrus.uml.diagram.clazz,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="3.3.200",
+ org.eclipse.papyrus.uml.diagram.linklf,
+ org.eclipse.uml2.uml
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.Activator
+Export-Package: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.factories;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.providers;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures;x-friends:="org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests",
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators;x-friends:="org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests",
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source;x-friends:="org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests",
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.target;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.preferences;x-internal:=true
+Bundle-Vendor: Eclipse Modeling Project
+
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/about.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/about.html
new file mode 100644
index 0000000..ef2872f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/about.html
@@ -0,0 +1,28 @@
+<!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>November 30, 2017</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 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/build.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/build.properties
new file mode 100644
index 0000000..e9863e2
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/doc/overview.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/doc/overview.html
new file mode 100644
index 0000000..271de25
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/doc/overview.html
@@ -0,0 +1,11 @@
+<html xmlns="http://www.w3.org/1999/html">
+    <body> 
+<div class="header">
+<H2>Goal</H2>
+The enhanced association label layout is a plug-in to display labels of an association in more "efficient" way. No move are autorized on labels while using it.<BR><BR>
+<IMG width="830px" alt="Example without and with the layout" SRC="screenshot.jpg">
+<H2>Implementation</H2>
+All the java classes are javadoc-ed. To understand the implementation, the best is to start reading the javadoc of the {@link  org.eclipse.papyrus.uml.diagram.clazz.layout.association.edit.parts.providers.ProvidersForUmlAssociation} class.
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/plugin.xml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/plugin.xml
new file mode 100644
index 0000000..746096c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/plugin.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         id="ep-provider"
+         point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+      <editpartProvider
+            class="org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.providers.SelfLaidOutAssociationEditPartProvider">
+         <Priority
+               name="Low">
+         </Priority>
+      </editpartProvider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.preferences.Page"
+            id="enhancedassociationlabellayout.preference_page"
+            name="Enhanced Association Label Layout">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="enhancedassociationlabellayout.product"
+            name="PreferenceAssociationLabelLayout">
+         <property
+               name="preferenceCustomization"
+               value="plugin_customization.ini">
+         </property>
+      </product>
+   </extension>
+   <extension
+         point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+      <editpolicyProvider
+            class="org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.policies.providers.NoMoveEditPolicyProvider">
+         <Priority
+               name="Lowest">
+         </Priority>
+      </editpolicyProvider>
+   </extension>
+
+</plugin>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/Activator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/Activator.java
new file mode 100644
index 0000000..54575e1
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/Activator.java
@@ -0,0 +1,136 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.messages.Messages;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+		public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout"; //$NON-NLS-1$
+
+		// The shared instance
+		private static Activator plugin;
+		
+		private LogHelper myLogHelper;
+		
+
+		/**
+		 * The constructor
+		 */
+		public Activator() {
+			
+		}
+
+		@Override
+		public void start(BundleContext context) throws Exception {
+			super.start(context);
+			plugin = this;
+		}
+
+		@Override
+		public void stop(BundleContext context) throws Exception {
+			plugin = null;
+			super.stop(context);
+		}
+
+		/**
+		 * Returns the shared instance
+		 *
+		 * @return the shared instance
+		 */
+		public static Activator getDefault() {
+			return plugin;
+		}
+		
+		/**
+		 * Logs an error through a message (param)
+		 * @param error
+		 */
+		public void logError(String error) {
+			getLogHelper().warn(error);
+		}
+
+		/**
+		 * Logs an error through a message and an exception (params)
+		 * @param error
+		 * @param throwable
+		 */
+		public void logError(String error, Throwable throwable) {
+			getLogHelper().error(error, throwable);
+		}
+
+		/**
+		 * Logs an information through a message (param)
+		 * @param message
+		 */
+		public void logInfo(String message) {
+			getLogHelper().info(message);
+		}
+
+		/**
+		 * Logs an information through a message and an exception (params)
+		 * @param message
+		 * @param throwable
+		 */
+		public void logInfo(String message, Throwable throwable) {
+			getLogHelper().error(message, throwable);
+		}
+
+		/**
+		 * Gets the LogHelper
+		 * @return
+		 */
+		public LogHelper getLogHelper() {
+			if (myLogHelper==null) {
+				myLogHelper=new LogHelper(getDefault());
+			}
+			return myLogHelper;
+		}
+
+		public void logNullParameter(String parameterName) {
+			getLogHelper().warn(Messages.Activator_Parameter+parameterName+Messages.Activator_IsNullInMethod+getMethodName(4));
+		}
+		
+		public void logNullParameter(String parameterName, int deep) {
+			getLogHelper().warn(Messages.Activator_Parameter+parameterName+Messages.Activator_IsNullInMethod+getMethodName(deep));
+		}
+		
+		public void logCastProblem(String variableName, Class targetCastClass, int deep) {
+			getLogHelper().warn(variableName+Messages.Activator_CannotBeCastedIn+targetCastClass.getName()+Messages.Activator_InMethod+getMethodName(deep));
+		}
+		
+		public void logCastProblem(String variableName, Class targetCastClass) {
+			getLogHelper().warn(variableName+Messages.Activator_CannotBeCastedIn+targetCastClass.getName()+Messages.Activator_InMethod+getMethodName(3));
+		}
+		
+		/**
+		 * Get the method name for a depth in call stack. <br />
+		 * Utility function
+		 * @param depth depth in the call stack (0 means current method, 1 means call method, ...)
+		 * @return method name
+		 */
+		public static String getMethodName(int deep)
+		{
+		  final StackTraceElement[] ste = Thread.currentThread().getStackTrace();
+		  return ste[deep].getMethodName()+"("+ste[deep].getClassName()+")"; 
+		}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/AccessForLocatorManager.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/AccessForLocatorManager.java
new file mode 100644
index 0000000..ab21770
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/AccessForLocatorManager.java
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gef.EditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.locator.PapyrusLabelLocator;
+
+/**
+ * This interface is defined to propose to the locator manager an access to some
+ * methods of edit parts: its locator, properties of its element
+ * (notation-level), its parent and the initialization of the locator.
+ *
+ */
+public interface AccessForLocatorManager { 
+
+	/**
+	 * Access to the locator
+	 * 
+	 * @return the locator
+	 */
+	public PapyrusLabelLocator getLocator();
+
+	/**
+	 * Sets the locator
+	 * 
+	 * @param locator the locator
+	 */
+	public void setLocator(PapyrusLabelLocator locator);
+
+	/**
+	 * This method is needed to access to X and Y
+	 * 
+	 * @param feature object that defines the feature type
+	 * @return the value of the feature (on the associated notation-level object)
+	 */
+	public Object getStructuralFeatureValue(EStructuralFeature feature);
+
+	/**
+	 * Get the edit part parent
+	 * 
+	 * @return edit part parent
+	 */
+	public EditPart getParent();
+
+	/**
+	 * Initializes the locator with the connectionFigure (that gives access to all
+	 * figures of the association) and an offset (contact point ?).
+	 * 
+	 * @param connectionFigure object that gives access to all figures of the
+	 *                         association
+	 *                         ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutAssociationFigure}).
+	 * @param offset           contact point (?)
+	 */
+	public void initializeLocator(Connection connectionFigure, Point offset);
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/LocatorManager.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/LocatorManager.java
new file mode 100644
index 0000000..14e6639
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/LocatorManager.java
@@ -0,0 +1,98 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.locator.PapyrusLabelLocator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.preferences.Settings;
+
+/**
+ * This class is used to centralize and delegate operations about locators of
+ * the association end * edit parts. The class aims at:
+ * <UL>
+ * <LI>Checking if a locator has been created and associated to the edit
+ * part</LI>
+ * <LI>Initializing the locator</LI>
+ * <LI>Checking Papyrus preferences to see whether the locators of this plug-in
+ * will be used or not</LI>
+ * </UL>
+ *
+ */
+public class LocatorManager {
+
+	private AccessForLocatorManager accessForLocatorManager;
+	private boolean activated;
+
+	/**
+	 * Each locator manager is associated to an edit part. Here, in order to access
+	 * different types of edit parts (with not enough things in common), we have
+	 * defined and used an interface {@link AccessForLocatorManager} for this common
+	 * access/association.
+	 * 
+	 * @param editPart edit part that implements our specific interface {@link AccessForLocatorManager}
+	 */
+	public LocatorManager(AccessForLocatorManager editPart) {
+		this.accessForLocatorManager = editPart;
+		activated = Settings.getInstance().isActivated();
+	}
+
+	/**
+	 * This method is called by association end * edit part at the first refreshBounds invocation.
+	 * It will invoke the {@link LocatorManager#initializeLocator()} method if there is no locator in the edit part. 
+	 */
+	protected void connectSpecificLocatorIfActivated() {
+		hasActivationStatusChanged();
+		if (Settings.getInstance().isActivated()) {
+			PapyrusLabelLocator locator = accessForLocatorManager.getLocator();
+			if (locator == null) {
+				initializeLocator();
+			}
+		}
+	}
+
+	/**
+	 * This method just stores the plug-in activation status and/or see whether it has changed or not in order to reset locator (and it will be re-created at the next refreshBounds of the edit part). 
+	 */
+	protected void hasActivationStatusChanged() {
+		if (Settings.getInstance().isActivated() != activated) {
+			accessForLocatorManager.setLocator(null);
+			activated = Settings.getInstance().isActivated();
+		}
+	}
+
+	/**
+	 * Reuse a part of the implementation of super class for the locator initialization, but with different types of objects for figure and locator. 
+	 */
+	protected void initializeLocator() {
+		int dx = ((Integer) accessForLocatorManager.getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+		int dy = ((Integer) accessForLocatorManager.getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+
+		Point offset = new Point(dx, dy);
+
+		if (accessForLocatorManager.getParent() instanceof AbstractConnectionEditPart) {
+
+			Connection connectionFigure = AbstractConnectionEditPart.class.cast(accessForLocatorManager.getParent()).getConnectionFigure();
+
+			if (accessForLocatorManager.getLocator() == null) {
+				accessForLocatorManager.initializeLocator(connectionFigure, offset);
+			}
+		}
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEditPart.java
new file mode 100644
index 0000000..373f6bf
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEditPart.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutAssociationFigure;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.preferences.Settings;
+
+/**
+ * This class is the entry point to the orchestrator of the creation of figure
+ * elements of the association. Overriding AssociationEditPart is mainly
+ * motivated to overriding the usual ConnectionFigure by ours
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutAssociationFigure}.
+ * This one will replace all role and multiplicity labels with ours. The system
+ * of location is done with other edit parts of this package.
+ *
+ */
+public class SelfLaidOutAssociationEditPart extends AssociationEditPart {
+
+	/**
+	 * This constructor only do the same thing as this ancestror.
+	 * 
+	 * @param view (legacy)
+	 */
+	public SelfLaidOutAssociationEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * This methods checks whether the plug-in is activated or not (preferences). If
+	 * it is, it replaces the connection figure with an instance of our own implementation (see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutAssociationFigure}).
+	 */
+	@Override
+	protected Connection createConnectionFigure() {
+		if (Settings.getInstance().isActivated()) {
+			return new SelfLaidOutAssociationFigure(this);
+		}
+		else {
+			return super.createConnectionFigure();
+		}
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEndSourceEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEndSourceEditPart.java
new file mode 100644
index 0000000..f156cd5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEndSourceEditPart.java
@@ -0,0 +1,98 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.locator.PapyrusLabelLocator;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AssociationEndSourceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.target.TargetLocatorFactory;
+
+/**
+ * This alternative implementation of AssociationEndSourceEditPart is mainly
+ * motivated to bypass the access to the corresponding figure (source role
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutWrappingLabel})
+ * and its associated locator
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.target.RoleTargetLabelLocator}.<BR>
+ * <B>Note: Roles source/target are inverted in Papyrus implementation. I do not
+ * know why.</B>
+ *
+ */
+public class SelfLaidOutAssociationEndSourceEditPart extends AssociationEndSourceEditPart implements AccessForLocatorManager {
+
+	private LocatorManager locatorManager;
+
+	/**
+	 * Inherited constructor.
+	 * 
+	 * @param view (legacy)
+	 */
+	public SelfLaidOutAssociationEndSourceEditPart(View view) {
+		super(view);
+		locatorManager = new LocatorManager(this);
+	}
+
+	/**
+	 * This method is called when an visual update is necessary. The main goal here
+	 * is to create an instance of our locator
+	 * ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.target.RoleTargetLabelLocator})
+	 * if it is the first refreshBounds. The creation of this instance is done
+	 * through the {@link SelfLaidOutAssociationEndSourceEditPart#initializeLocator(Connection, Point)} method here but this method is called in the
+	 * LocatorManager
+	 * ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.LocatorManager#connectSpecificLocatorIfActivated()}
+	 */
+	@Override
+	public void refreshBounds() {
+		locatorManager.connectSpecificLocatorIfActivated();
+		super.refreshBounds();
+	}
+
+	/**
+	 * This method creates the (good) locator for this source role.
+	 */
+	public void initializeLocator(Connection connectionFigure, Point offset) {
+		papyrusLabelLocator = TargetLocatorFactory.getInstance().createRoleTargetLabelLocator(connectionFigure, offset, getKeyPoint());
+	}
+
+	/**
+	 * This method gets the corresponding figure for this source role. It asks the AssociationFigure (PrimaryShape) for that.
+	 */
+	@Override
+	public IFigure getFigure() {
+		return AssociationEditPart.class.cast(getParent()).getPrimaryShape().getRoleSourceLabel();
+	}
+
+	/**
+	 * This method gets the locator (i.e. layout manager) for this source role.
+	 */
+	@Override
+	public PapyrusLabelLocator getLocator() {
+		return this.papyrusLabelLocator;
+	}
+
+	/**
+	 * This method sets the locator (i.e. layout manager) for this source role.
+	 */
+	@Override
+	public void setLocator(PapyrusLabelLocator locator) {
+		this.papyrusLabelLocator = locator;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEndTargetEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEndTargetEditPart.java
new file mode 100644
index 0000000..c2f4a4f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationEndTargetEditPart.java
@@ -0,0 +1,100 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.locator.PapyrusLabelLocator;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AssociationEndTargetEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source.SourceLocatorFactory;
+
+/**
+ * This alternative implementation of AssociationEndTargetEditPart is mainly
+ * motivated to bypass the access to the corresponding figure (target role
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutWrappingLabel})
+ * and its associated locator
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source.RoleSourceLabelLocator}.<BR>
+ * <B>Note: Roles source/target are inverted in Papyrus implementation. I do not
+ * know why.</B>
+ *
+ */
+public class SelfLaidOutAssociationEndTargetEditPart extends AssociationEndTargetEditPart implements AccessForLocatorManager {
+
+	private LocatorManager locatorManager;
+
+	/**
+	 * Inherited constructor.
+	 * 
+	 * @param view (legacy)
+	 */
+
+	public SelfLaidOutAssociationEndTargetEditPart(View view) {
+		super(view);
+		locatorManager = new LocatorManager(this);
+	}
+
+	/**
+	 * This method is called when an visual update is necessary. The main goal here
+	 * is to create an instance of our locator
+	 * ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source.RoleSourceLabelLocator})
+	 * if it is the first refreshBounds. The creation of this instance is done
+	 * through the {@link SelfLaidOutAssociationEndTargetEditPart#initializeLocator(Connection, Point)} method here but this method is called in the
+	 * LocatorManager
+	 * ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.LocatorManager#connectSpecificLocatorIfActivated()}
+	 */
+	@Override
+	public void refreshBounds() {
+		locatorManager.connectSpecificLocatorIfActivated();
+
+		super.refreshBounds();
+	}
+
+	/**
+	 * This method creates the (good) locator for this target role.
+	 */
+	public void initializeLocator(Connection connectionFigure, Point offset) {
+		papyrusLabelLocator = SourceLocatorFactory.getInstance().createRoleSourceLabelLocator(connectionFigure, offset, getKeyPoint());
+	}
+
+	/**
+	 * This method gets the corresponding figure for this target role. It asks the AssociationFigure (PrimaryShape) for that.
+	 */
+	@Override
+	public IFigure getFigure() {
+		return AssociationEditPart.class.cast(getParent()).getPrimaryShape().getRoleTargetLabel();
+	}
+
+	/**
+	 * This method gets the locator (i.e. layout manager) for this target role.
+	 */
+	@Override
+	public PapyrusLabelLocator getLocator() {
+		return this.papyrusLabelLocator;
+	}
+
+	/**
+	 * This method sets the locator (i.e. layout manager) for this target role.
+	 */
+	@Override
+	public void setLocator(PapyrusLabelLocator locator) {
+		this.papyrusLabelLocator = locator;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationMultiplicitySourceEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationMultiplicitySourceEditPart.java
new file mode 100644
index 0000000..8b8f584
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationMultiplicitySourceEditPart.java
@@ -0,0 +1,110 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.locator.PapyrusLabelLocator;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source.SourceLocatorFactory;
+
+/**
+ * This alternative implementation of AssociationMultiplicitySourceEditPart is
+ * mainly motivated to bypass the access to the corresponding figure (source
+ * multiplicity
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutWrappingLabel})
+ * and its associated locator
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source.MultiplicitySourceLabelLocator}.<BR>
+ * 
+ */
+
+public class SelfLaidOutAssociationMultiplicitySourceEditPart extends AssociationMultiplicitySourceEditPart
+		implements AccessForLocatorManager {
+
+	private LocatorManager locatorManager;
+
+	/**
+	 * Inherited constructor.
+	 * 
+	 * @param view (legacy)
+	 */
+
+	public SelfLaidOutAssociationMultiplicitySourceEditPart(View view) {
+		super(view);
+		locatorManager = new LocatorManager(this);
+	}
+
+	/**
+	 * This method is called when an visual update is necessary. The main goal here
+	 * is to create an instance of our locator
+	 * ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source.MultiplicitySourceLabelLocator})
+	 * if it is the first refreshBounds. The creation of this instance is done
+	 * through the
+	 * {@link SelfLaidOutAssociationMultiplicitySourceEditPart#initializeLocator(Connection, Point)}
+	 * method here but this method is called in the LocatorManager
+	 * ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.LocatorManager#connectSpecificLocatorIfActivated()}
+	 */
+
+	@Override
+	public void refreshBounds() {
+		locatorManager.connectSpecificLocatorIfActivated();
+
+		super.refreshBounds();
+	}
+
+	/**
+	 * This method creates the (good) locator for this source multiplicity.
+	 */
+
+	public void initializeLocator(Connection connectionFigure, Point offset) {
+		papyrusLabelLocator = SourceLocatorFactory.getInstance().createMultiplicitySourceLabelLocator(connectionFigure, offset, getKeyPoint());
+	}
+
+	/**
+	 * This method gets the corresponding figure for this source multiplicity. It
+	 * asks the AssociationFigure (PrimaryShape) for that.
+	 */
+
+	@Override
+	public IFigure getFigure() {
+		return AssociationEditPart.class.cast(getParent()).getPrimaryShape().getMultiplicitySourceLabel();
+	}
+
+	/**
+	 * This method gets the locator (i.e. layout manager) for this source
+	 * multiplicity.
+	 */
+
+	@Override
+	public PapyrusLabelLocator getLocator() {
+		return this.papyrusLabelLocator;
+	}
+
+	/**
+	 * This method sets the locator (i.e. layout manager) for this source
+	 * multiplicity.
+	 */
+
+	@Override
+	public void setLocator(PapyrusLabelLocator locator) {
+		this.papyrusLabelLocator = locator;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationMultiplicityTargetEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationMultiplicityTargetEditPart.java
new file mode 100644
index 0000000..fbc5b02
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/SelfLaidOutAssociationMultiplicityTargetEditPart.java
@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.locator.PapyrusLabelLocator;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.target.TargetLocatorFactory;
+
+/**
+ * This alternative implementation of AssociationMultiplicityTargetEditPart is mainly
+ * motivated to bypass the access to the corresponding figure (target multiplicity
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutWrappingLabel})
+ * and its associated locator
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.target.MultiplicityTargetLabelLocator}.<BR>
+ * 
+ */
+
+public class SelfLaidOutAssociationMultiplicityTargetEditPart extends AssociationMultiplicityTargetEditPart implements AccessForLocatorManager {
+
+	private LocatorManager locatorManager;
+	
+	/**
+	 * Inherited constructor.
+	 * 
+	 * @param view (legacy)
+	 */
+	public SelfLaidOutAssociationMultiplicityTargetEditPart(View view) {
+		super(view);
+		locatorManager=new LocatorManager(this);
+	}
+
+	/**
+	 * This method is called when an visual update is necessary. The main goal here
+	 * is to create an instance of our locator
+	 * ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.target.MultiplicityTargetLabelLocator})
+	 * if it is the first refreshBounds. The creation of this instance is done
+	 * through the {@link SelfLaidOutAssociationMultiplicityTargetEditPart#initializeLocator(Connection, Point)} method here but this method is called in the
+	 * LocatorManager
+	 * ({@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.LocatorManager#connectSpecificLocatorIfActivated()}
+	 */
+	@Override
+	public void refreshBounds() {
+		locatorManager.connectSpecificLocatorIfActivated();
+		
+		super.refreshBounds();
+	}
+	
+	/**
+	 * This method creates the (good) locator for this target multiplicity.
+	 */
+	
+	public void initializeLocator(Connection connectionFigure, Point offset) {
+		papyrusLabelLocator = TargetLocatorFactory.getInstance().createMultiplicityTargetLabelLocator(connectionFigure, offset, getKeyPoint());
+	}
+	
+	/**
+	 * This method gets the corresponding figure for this target multiplicity. It asks the AssociationFigure (PrimaryShape) for that.
+	 */
+	@Override
+	public IFigure getFigure() {
+		return AssociationEditPart.class.cast(getParent()).getPrimaryShape().getMultiplicityTargetLabel();
+	}
+
+	/**
+	 * This method gets the locator (i.e. layout manager) for this target multiplicity.
+	 */
+	@Override
+	public PapyrusLabelLocator getLocator() {
+		return this.papyrusLabelLocator;
+	}
+
+	/**
+	 * This method sets the locator (i.e. layout manager) for this target multiplicity.
+	 */
+	@Override
+	public void setLocator(PapyrusLabelLocator locator) {
+		this.papyrusLabelLocator=locator;
+	}
+
+
+
+	
+	
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/factories/SelfLaidOutAssociationEditPartFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/factories/SelfLaidOutAssociationEditPartFactory.java
new file mode 100644
index 0000000..b54b831
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/factories/SelfLaidOutAssociationEditPartFactory.java
@@ -0,0 +1,86 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.factories;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AssociationEndSourceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AssociationEndTargetEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationEndSourceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationEndTargetEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationMultiplicitySourceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationMultiplicityTargetEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.preferences.Settings;
+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
+
+/**
+ * This class is a factory that aims at replacing edit parts of association
+ * components. It is settled by
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.providers.SelfLaidOutAssociationEditPartProvider}.
+ * See method
+ * {@link SelfLaidOutAssociationEditPartFactory#createEditPart(EditPart, Object)} to
+ * know what edit parts are replaced.
+ *
+ */
+public class SelfLaidOutAssociationEditPartFactory implements EditPartFactory {
+
+	/**
+	 * At every creation of element, a list of factories (like this class) are
+	 * called to see whether they can provide an edit part for the context passed in
+	 * parameter. We use the VisualID of the view (if the model object is a view) to
+	 * be notified that association components are being created, and in order to
+	 * react by giving our own implementation: that will locate automatically and
+	 * efficiently labels of association. <BR>
+	 * The edit parts concerned are : <UL>
+	 * <LI> AssociationEditPart (replaced by MyAssociationEditPart)</LI>
+	 * <LI> AssociationEndSourceEditPart (replaced by MyAssociationEndSourceEditPart)</LI>
+	 * <LI> AssociationEndTargetEditPart (replaced by MyAssociationEndTargetEditPart)</LI>
+	 * <LI> AssociationMultiplicitySourceEditPart (replaced by MyAssociationMultiplicitySourceEditPart)</LI>
+	 * <LI> AssociationMultiplicityTargetEditPart (replaced by MyAssociationMultiplicityTargetEditPart)</LI>
+	 * </UL>
+	 * The method returns nothing if it isn't about these types of elements related to such edit parts..
+	 */
+	@Override
+	public EditPart createEditPart(EditPart context, Object model) {
+		if (model instanceof View && Settings.getInstance().isActivated()) {
+			View view = View.class.cast(model);
+			switch (UMLVisualIDRegistry.getVisualID(view)) {
+			case AssociationEditPart.VISUAL_ID:
+				return new SelfLaidOutAssociationEditPart(view);
+
+			case AssociationEndSourceEditPart.VISUAL_ID:
+				return new SelfLaidOutAssociationEndSourceEditPart(view);
+
+			case AssociationEndTargetEditPart.VISUAL_ID:
+				return new SelfLaidOutAssociationEndTargetEditPart(view);
+
+			case AssociationMultiplicitySourceEditPart.VISUAL_ID:
+				return new SelfLaidOutAssociationMultiplicitySourceEditPart(view);
+
+			case AssociationMultiplicityTargetEditPart.VISUAL_ID:
+				return new SelfLaidOutAssociationMultiplicityTargetEditPart(view);
+			default:
+			}
+		}
+		return null;
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/providers/SelfLaidOutAssociationEditPartProvider.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/providers/SelfLaidOutAssociationEditPartProvider.java
new file mode 100644
index 0000000..9f28c85
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/parts/providers/SelfLaidOutAssociationEditPartProvider.java
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.providers;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.providers.DefaultEditPartProvider;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.factories.SelfLaidOutAssociationEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
+
+/**
+ * This class is the starting point of this plug-in. It implements an extension
+ * point in order to override edit parts implementation of association
+ * components. See the class
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.factories.SelfLaidOutAssociationEditPartFactory}
+ * to know what edit parts are replaced for this plug-in.
+ */
+public class SelfLaidOutAssociationEditPartProvider extends DefaultEditPartProvider {
+
+	/**
+	 * This method is called by Papyrus to get a factory that will provide edit
+	 * parts according context passed as parameters.
+	 * 
+	 */
+	public SelfLaidOutAssociationEditPartProvider() {
+		super(new SelfLaidOutAssociationEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, ModelEditPart.MODEL_ID);
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/policies/NoMoveEditPolicy.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/policies/NoMoveEditPolicy.java
new file mode 100644
index 0000000..08b5b0c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/policies/NoMoveEditPolicy.java
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.policies;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.editpolicies.AbstractEditPolicy;
+import org.eclipse.papyrus.commands.wrappers.GMFtoGEFCommandWrapper;
+
+public class NoMoveEditPolicy extends AbstractEditPolicy {
+
+	EditPart editPart;
+
+	public NoMoveEditPolicy(EditPart editPart) {
+		super();
+		this.editPart = editPart;
+	}
+
+	@Override
+	public Command getCommand(Request request) {
+		if (request instanceof org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest) {
+			return new GMFtoGEFCommandWrapper(org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE);
+		}
+		return super.getCommand(request);
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/policies/providers/NoMoveEditPolicyProvider.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/policies/providers/NoMoveEditPolicyProvider.java
new file mode 100644
index 0000000..9bd53e5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/edit/policies/providers/NoMoveEditPolicyProvider.java
@@ -0,0 +1,56 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.policies.providers;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationEndSourceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationEndTargetEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationMultiplicitySourceEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.parts.SelfLaidOutAssociationMultiplicityTargetEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.edit.policies.NoMoveEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.preferences.Settings;
+
+public class NoMoveEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	@Override
+	public boolean provides(IOperation operation) {
+		if (Settings.getInstance().isActivated() && operation instanceof CreateEditPoliciesOperation) {
+			CreateEditPoliciesOperation creationOperation = CreateEditPoliciesOperation.class.cast(operation);
+			EditPart editPart = creationOperation.getEditPart();
+			if (editPart instanceof SelfLaidOutAssociationEndTargetEditPart ||
+					editPart instanceof SelfLaidOutAssociationEndSourceEditPart ||
+					editPart instanceof SelfLaidOutAssociationMultiplicitySourceEditPart ||
+					editPart instanceof SelfLaidOutAssociationMultiplicityTargetEditPart) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		NoMoveEditPolicy editPolicy = new NoMoveEditPolicy(editPart);
+		editPart.installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, editPolicy);
+
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/figures/SelfLaidOutAssociationFigure.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/figures/SelfLaidOutAssociationFigure.java
new file mode 100644
index 0000000..4eb2612
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/figures/SelfLaidOutAssociationFigure.java
@@ -0,0 +1,160 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.css.CSSConnectorImpl;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.common.figure.edge.AssociationFigure;
+import org.eclipse.uml2.uml.Association;
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * This class gives access to visual elements that compose the association. It
+ * inherits from AssociationFigure and replaces all the labels the previous gave
+ * by our visual labels (with enhanced layout manager).
+ *
+ */
+public class SelfLaidOutAssociationFigure extends AssociationFigure {
+
+	private PapyrusWrappingLabel fMultiplicitySourceLabel;
+	private PapyrusWrappingLabel fRoleSourceLabel;
+
+	private PapyrusWrappingLabel fMultiplicityTargetLabel;
+	private PapyrusWrappingLabel fRoleTargetLabel;
+
+	private AssociationEditPart associationEditPart;
+
+	/**
+	 * Legacy constructor (?)
+	 */
+	public SelfLaidOutAssociationFigure() {
+	}
+
+	/**
+	 * A constructor dedicated to association
+	 * 
+	 * @param associationEditPart the association (GEF-level)
+	 */
+	public SelfLaidOutAssociationFigure(AssociationEditPart associationEditPart) {
+		this.associationEditPart = associationEditPart;
+	}
+
+	/**
+	 * This method constructs all the visual elements of the association. It
+	 * overrides the existing method in order to replace classic visual elements by
+	 * our "better-layout-ed" elements.
+	 */
+	@Override
+	protected void createContents() {
+
+		super.createContents();
+
+		this.remove(super.getMultiplicitySourceLabel());
+		this.remove(super.getMultiplicityTargetLabel());
+		this.remove(super.getRoleSourceLabel());
+		this.remove(super.getRoleTargetLabel());
+
+		fMultiplicityTargetLabel = new SelfLaidOutWrappingLabel();
+		fMultiplicityTargetLabel.setText(""); //$NON-NLS-1$
+		this.add(fMultiplicityTargetLabel);
+
+		fRoleTargetLabel = new SelfLaidOutWrappingLabel();
+		fRoleTargetLabel.setText(""); //$NON-NLS-1$
+		this.add(fRoleTargetLabel);
+
+		fMultiplicitySourceLabel = new SelfLaidOutWrappingLabel();
+		fMultiplicitySourceLabel.setText(""); //$NON-NLS-1$
+		this.add(fMultiplicitySourceLabel);
+
+		fRoleSourceLabel = new SelfLaidOutWrappingLabel();
+		fRoleSourceLabel.setText(""); //$NON-NLS-1$
+		this.add(fRoleSourceLabel);
+
+	}
+
+	/**
+	 * Gets the association ends of the association (it's for checking (after) if they are decorated).
+	 * @return
+	 */
+	private EList<Property> getMemberEndsOfAssociation() {
+		CSSConnectorImpl notationElement = (CSSConnectorImpl) associationEditPart.getModel();
+		Association association = (Association) notationElement.getElement();
+		return association.getMemberEnds();
+	}
+
+	/**
+	 * Determines if the source of the association is decorated (in order to add a bigger distance for the source label).
+	 * @return true if there is a decoration (like an arrow)
+	 */
+	public boolean getDecorationOfSource() {
+		Property property = getMemberEndsOfAssociation().get(0);
+		return (property.isNavigable());
+
+	}
+
+	/**
+	 * Determines if the target of the association is decorated (in order to add a bigger distance for the target label).
+	 * @return true if there is a decoration (like an arrow)
+	 */
+	public boolean getDecorationOfTarget() {
+		Property property = getMemberEndsOfAssociation().get(1);
+		return (property.isNavigable());
+	}
+
+	/**
+	 * Gets the new/our multiplicity source label
+	 */
+	@Override
+	public WrappingLabel getMultiplicitySourceLabel() {
+		return fMultiplicitySourceLabel;
+	}
+
+	/**
+	 * Gets the new/our role source label
+	 */
+	@Override
+	public WrappingLabel getRoleSourceLabel() {
+		return fRoleSourceLabel;
+	}
+
+	/**
+	 * Gets the new/our multiplicity target label
+	 */
+	@Override
+	public WrappingLabel getMultiplicityTargetLabel() {
+		return fMultiplicityTargetLabel;
+	}
+
+	/**
+	 * Gets the new/our role target label
+	 */
+	@Override
+	public WrappingLabel getRoleTargetLabel() {
+		return fRoleTargetLabel;
+	}
+
+	/**
+	 * Gets the associated association edit part
+	 * @return association edit part
+	 */
+	public AssociationEditPart getAssociationEditPart() {
+		return associationEditPart;
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/figures/SelfLaidOutWrappingLabel.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/figures/SelfLaidOutWrappingLabel.java
new file mode 100644
index 0000000..beef882
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/figures/SelfLaidOutWrappingLabel.java
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures;
+
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+
+/**
+ * This class is only useful for redefining the low-level visual label for
+ * multiplicity source in order to set an opaque background.
+ *
+ */
+public class SelfLaidOutWrappingLabel extends PapyrusWrappingLabel {
+
+	/**
+	 * Paints method is the one to redefine for this opacity the background.
+	 */
+	@Override
+	public void paint(Graphics graphics) {
+		graphics.fillRectangle(this.getBounds());
+		super.paint(graphics);
+
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/AbstractAssociatedSegment.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/AbstractAssociatedSegment.java
new file mode 100644
index 0000000..3ab0273
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/AbstractAssociatedSegment.java
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+
+/**
+ * This class defines objects that are helpers for associationEditPart for
+ * geometric operations.<BR>
+ * This class will be specialized for source and for target sides. <BR>
+ * Instances will allow to calculate:
+ * <UL>
+ * <LI>the gradient of segment (of the association) attached to the
+ * source/target class/side</LI>
+ * <LI>the angle of this segment from the attached class</LI>
+ * <LI>the direction of the segment (to the back ?)</LI>
+ * <LI>a point on the segment with a given distant to the beginning of the
+ * segment (connector segment-class)</LI>
+ * </UL>
+ *
+ */
+public abstract class AbstractAssociatedSegment {
+	protected IFigure target;
+	protected Point startingPoint = null;
+	protected Point endPoint = null;
+	protected AssociationEditPart associationEditPart;
+
+	/**
+	 * The object need the visual element (figure) and the whole association edit
+	 * part
+	 * 
+	 * @param target              the visual element
+	 * @param associationEditPart the whole manager of the association (the
+	 *                            association edit part)
+	 */
+	public AbstractAssociatedSegment(IFigure target, AssociationEditPart associationEditPart) {
+		this.target = target;
+		this.associationEditPart = associationEditPart;
+	}
+
+	/**
+	 * Abstract method that will be implemented to give the starting point of the
+	 * related segment
+	 * 
+	 * @return the starting point of the segment (connector segment-class)
+	 */
+	public abstract Point getStartingPoint();
+
+	/**
+	 * Abstract method that will be implemented to give the end point of the related
+	 * segment (that can be the connector segment-class of the other side if the
+	 * association is not multi-segmented)
+	 * 
+	 * @return the end point of the segment (connector segment-class)
+	 */
+	public abstract Point getEndPoint();
+
+	/**
+	 * Abstract method that will be implemented to give the class concerned by this
+	 * side of the association (starting point is on this class)
+	 * 
+	 * @return class related to this side of the association
+	 */
+	public abstract AbstractGraphicalEditPart getConnectedElement();
+
+	/**
+	 * Gets the gradient of the segment (of the association if it is not
+	 * multi-segmented)
+	 * 
+	 * @return the gradiant
+	 */
+	public double getGradient() {
+		Point p1 = getStartingPoint();
+		Point p2 = getEndPoint();
+		return (double) (p2.y - p1.y) / (double) (p2.x - p1.x);
+	}
+
+	/**
+	 * Gets the angle of the segment (of the association if it is not
+	 * multi-segmented) compared to a horizontal line.
+	 * 
+	 * @return the angle (not in degrees)
+	 */
+	public double getAngle() {
+		return Math.atan(getGradient());
+	}
+
+	/**
+	 * This method returns true if the end of the segment is "before" the start.
+	 * 
+	 * @return true if the segment get back to the left.
+	 */
+	public boolean doesSegmentPointToBack() {
+		Point p1 = getStartingPoint();
+		Point p2 = getEndPoint();
+		return (p2.x < p1.x);
+	}
+
+	/**
+	 * Important method: gives a point on the segment with a given distant to the
+	 * beginning of the segment
+	 * 
+	 * @param distance distance between the starting point and the returned point
+	 * @return the point at the wanted distant and on the segment
+	 */
+	public Point getThePointDistantOf(double distance) {
+		try {
+
+			double angle = getAngle();
+			double dx = distance * Math.cos(angle);
+			double dy = distance * Math.sin(angle);
+			Point currentStartingPoint = getStartingPoint();
+			if (doesSegmentPointToBack())
+				return new Point((int) (currentStartingPoint.x - dx), (int) (currentStartingPoint.y - dy));
+
+			return new Point((int) (currentStartingPoint.x + dx), (int) (currentStartingPoint.y + dy));
+
+		} catch (ArithmeticException ex) {
+			int x = getStartingPoint().x;
+			int y = getStartingPoint().y;
+			if (getStartingPoint().y < getEndPoint().y)
+				y += distance;
+			else
+				y -= distance;
+			return new Point(x, y);
+		}
+
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/SelfLaidOutPapyrusLabelLocator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/SelfLaidOutPapyrusLabelLocator.java
new file mode 100644
index 0000000..95468b6
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/SelfLaidOutPapyrusLabelLocator.java
@@ -0,0 +1,90 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.papyrus.infra.gmfdiag.common.locator.PapyrusLabelLocator;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * This class specializes PapyrusLabelLocator in order to replace:
+ * <UL>
+ * <LI>the classic relocate method by ours</LI>
+ * <LI>the getBackgroundColor method by ours</LI>
+ * </UL>
+ * The method getAssociatedSegment that gives the helper object (see
+ * {@link AbstractAssociatedSegment}) will be implemented to correspond to the
+ * side of the association.
+ *
+ */
+public abstract class SelfLaidOutPapyrusLabelLocator extends PapyrusLabelLocator {
+
+	/**
+	 * Legacy constructor
+	 * 
+	 * @param parent    legacy parameter
+	 * @param offSet    legacy parameter
+	 * @param alignment legacy parameter
+	 */
+	public SelfLaidOutPapyrusLabelLocator(IFigure parent, Point offSet, int alignment) {
+		super(parent, offSet, alignment);
+	}
+
+	private static org.eclipse.swt.graphics.Color backgroundColor = null;
+	protected static final int DISTANCE_BETWEEN_LABEL_AND_CLASS = 20;
+
+	/**
+	 * The goal of this method is to set a global value of background (with alpha
+	 * value) for all label. I didn't manage to install this.
+	 * 
+	 * @return the global value of background
+	 */
+	public static org.eclipse.swt.graphics.Color getBackgroundColor() {
+		if (backgroundColor == null) {
+			backgroundColor = new org.eclipse.swt.graphics.Color(Display.getCurrent(), 255, 0, 0, 100);
+		}
+		return backgroundColor;
+	}
+
+	/**
+	 * All specialized subclasses will have to implement relocate method. This is
+	 * this method that locates the association label: the main method of our
+	 * plug-in.
+	 */
+	@Override
+	public abstract void relocate(IFigure target);
+
+	/**
+	 * This method gives the helper object (see {@link AbstractAssociatedSegment}).
+	 * It will be implemented to correspond to the side of the association.
+	 * 
+	 * @param target
+	 * @return
+	 */
+	public abstract AbstractAssociatedSegment getAssociatedSegment(IFigure target);
+
+	/**
+	 * This static method gives the distance between the whole label (role and
+	 * multiplicity) and the class.
+	 * 
+	 * @return
+	 */
+	public static int getDistanceBetweenLabelAndClass() {
+		return DISTANCE_BETWEEN_LABEL_AND_CLASS;
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/AbstractSourceLabelLocator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/AbstractSourceLabelLocator.java
new file mode 100644
index 0000000..7968b266
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/AbstractSourceLabelLocator.java
@@ -0,0 +1,337 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.figures.SelfLaidOutAssociationFigure;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.AbstractAssociatedSegment;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.SelfLaidOutPapyrusLabelLocator;
+
+/**
+ * This class implements the abstract class
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.SelfLaidOutPapyrusLabelLocator}
+ * and defines a lot of methods that will be useful for all labels (source and
+ * target) but also specializes some of them for the source side.
+ *
+ */
+public abstract class AbstractSourceLabelLocator extends SelfLaidOutPapyrusLabelLocator {
+
+	SourceLocatorFactory factory;
+
+	/**
+	 * Legacy constructor (except geoUtils)
+	 * 
+	 * @param parent    legacy parameter
+	 * @param offSet    legacy parameter
+	 * @param alignment legacy parameter
+	 * @param geoUtils  a factory to create associated segment
+	 */
+	public AbstractSourceLabelLocator(IFigure parent, Point offSet, int alignment, SourceLocatorFactory factory) {
+		super(parent, offSet, alignment);
+		this.factory = factory;
+	}
+
+	/**
+	 * Still to be implemented (to correspond to the final label).
+	 */
+	@Override
+	public abstract void relocate(IFigure target);
+
+	/**
+	 * This method return the width of the multiplicity and the role. This method is
+	 * important to calculate the location of the whole label (role + multiplicity).
+	 * 
+	 * @return
+	 */
+	public int getRoleMultiplicityWidth() {
+		try {
+			return getMultiplicityWidth() + getRoleWidth();
+		} catch (Exception ex) {
+			return 0;
+		}
+	}
+
+	/**
+	 * Gets the object that manages all the figures of the association.
+	 * 
+	 * @return
+	 */
+	public SelfLaidOutAssociationFigure getAssociationFigure() {
+		return SelfLaidOutAssociationFigure.class.cast(this.parent);
+	}
+
+	/**
+	 * 
+	 * Get the distance between the whole label and the class while taking into
+	 * account possible decoration.
+	 * 
+	 * @return the calculated distance
+	 */
+	public int getDistanceBetweenClassAndLabels() {
+		return DISTANCE_BETWEEN_LABEL_AND_CLASS + getMinimalDistanceBetweenClassAndLabels();
+	}
+
+	/**
+	 * Get the distance between the whole label and the class in the case label
+	 * intersects the class and still taking into account possible decoration.
+	 * 
+	 * @return the calculated distance
+	 */
+	public int getDistanceBetweenClassAndLabelsWhenIntersect() {
+		return getMinimalDistanceBetweenClassAndLabels() + 10;
+	}
+
+	/**
+	 * Get the smallest distance between the whole and the class (0 if not
+	 * decoration, and more if it is).<BR>
+	 * Specialized here for the source side.
+	 * 
+	 * @return the calculated distance
+	 */
+	public int getMinimalDistanceBetweenClassAndLabels() {
+		return (this.getAssociationFigure().getDecorationOfTarget() ? MARGIN_TO_NOT_BE_TOO_CLOSE : 0);
+	}
+
+	/**
+	 * Gets the multiplicity label of this side (source)
+	 * 
+	 * @return source multiplicity label
+	 */
+	public WrappingLabel getMultiplicity() {
+		return getAssociationFigure().getMultiplicitySourceLabel();
+	}
+
+	/**
+	 * Gets the role label of this side (source)
+	 * 
+	 * @return source role label
+	 */
+	public WrappingLabel getRole() {
+		return getAssociationFigure().getRoleTargetLabel();
+	}
+
+	/**
+	 * Gets the width of the multiplicity label of this side (source)
+	 * 
+	 * @return width of the source multiplicity label
+	 */
+	public int getMultiplicityWidth() {
+		return getMultiplicity().getBounds().width();
+	}
+
+	/**
+	 * Gets the width of the role label of this side (source)
+	 * 
+	 * @return width of the source role label
+	 */
+	public int getRoleWidth() {
+		return getRole().getBounds().width();
+	}
+
+	/**
+	 * Gets the height of the multiplicity label of this side (source)
+	 * 
+	 * @return height of the source multiplicity label
+	 */
+	public int getMultiplicityHeight() {
+		return getMultiplicity().getBounds().height();
+	}
+
+	/**
+	 * Gets the height of the role label of this side (source)
+	 * 
+	 * @return height of the source role label
+	 */
+	public int getRoleHeight() {
+		return getRole().getBounds().height();
+	}
+
+	/**
+	 * Creates the associated segment (helper for geometric operation). See
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.AbstractAssociatedSegment}
+	 */
+	public AbstractAssociatedSegment getAssociatedSegment(IFigure target) {
+		return factory.createAssociatedSourceSegment(target, this);
+	}
+
+	/**
+	 * Gets the bounds of the associated class. Bounds are always relative to the
+	 * container. So if there are many, it is required to translate the bounds
+	 * according to them.
+	 * 
+	 * @param associatedSegment the helper object (that references the class)
+	 * @return class bounds
+	 */
+	protected Rectangle getAssociatedElementBounds(AbstractAssociatedSegment associatedSegment) {
+		AbstractGraphicalEditPart connectedElement = associatedSegment.getConnectedElement();
+		Rectangle bounds = connectedElement.getFigure().getBounds().getCopy();
+		
+		// computer translation according to possible containers
+		
+		EditPart parent = connectedElement.getParent();
+		while (parent != null) {
+			if (parent instanceof CompartmentEditPart) {
+				CompartmentEditPart compartment = CompartmentEditPart.class.cast(parent);
+				Rectangle compartmentBounds = compartment.getFigure().getBounds();
+				bounds.x+=compartmentBounds.x;
+				bounds.y+=compartmentBounds.y;
+			}
+			parent = parent.getParent();
+		}
+		
+		return bounds;
+	}
+
+	/**
+	 * Get the bounds of the whole label for a specific distance from the class
+	 * 
+	 * @param distantPoint the distance from the class
+	 * @return the bounds of the whole label
+	 */
+	protected Rectangle getRectangleForBothLabels(Point distantPoint) {
+		return new Rectangle(distantPoint.x() - getRoleMultiplicityWidth() / 2,
+				distantPoint.y() - getRoleHeight() / 2 - 1, getRoleMultiplicityWidth(), getRoleHeight());
+	}
+
+	/**
+	 * Gets the x value of the multiplicity label inside the whole label
+	 * 
+	 * @param bothLabels the whole label bounds
+	 * @return the x value
+	 */
+	protected int getBasicXMultiplicity(Rectangle bothLabels) {
+		return bothLabels.x() + bothLabels.width() - getMultiplicityWidth();
+	}
+
+	/**
+	 * Gets the y value of the whole label
+	 * 
+	 * @param bothLabels the whole label bounds
+	 * @return the y value
+	 */
+	protected int getBasicYPosition(Rectangle bothLabels) {
+		return bothLabels.y;
+	}
+
+	/**
+	 * This method indicates if the whole label is in the y range of the class. If
+	 * it is, it means that a x value exists in order the whole label intersects the
+	 * class.
+	 * 
+	 * @param bothLabels  whole label bounds
+	 * @param classBounds class bounds
+	 * @return true if a x translation of the whole label exists that label and
+	 *         class intersect.
+	 */
+	protected boolean areLabelsAtTheSameHeightThanAssociatedClass(Rectangle bothLabels, Rectangle classBounds) {
+		return (getBasicYPosition(bothLabels) > getBasicYPosition(classBounds)
+				&& getBasicYPosition(bothLabels) < getBasicYPosition(classBounds) + classBounds.height())
+				|| (getBasicYPosition(bothLabels) + bothLabels.height() > getBasicYPosition(classBounds)
+						&& getBasicYPosition(bothLabels) + bothLabels.height() < getBasicYPosition(classBounds)
+								+ classBounds.height());
+	}
+
+	public static final int MARGIN_TO_NOT_BE_TOO_CLOSE = 10;
+
+	/**
+	 * The method indicates if the whole label intersects the class on its left
+	 * side.
+	 * 
+	 * @param bothLabels  whole label bounds
+	 * @param classBounds class bounds
+	 * @return true if intersection of the label on the left side of the class.
+	 */
+	protected boolean doLabelsIntersectAssociatedClassOnTheLeft(Rectangle bothLabels, Rectangle classBounds) {
+		return bothLabels.x() + bothLabels.width() + MARGIN_TO_NOT_BE_TOO_CLOSE > classBounds.x() && bothLabels.x()
+				+ bothLabels.width() + MARGIN_TO_NOT_BE_TOO_CLOSE < classBounds.x() + classBounds.width();
+	}
+
+	/**
+	 * The method indicates if the whole label intersects the class on its right
+	 * side.
+	 * 
+	 * @param bothLabels  whole label bounds
+	 * @param classBounds class bounds
+	 * @return true if intersection of the label on the right side of the class.
+	 */
+	protected boolean doLabelsIntersectAssociatedClassOnTheRight(Rectangle bothLabels, Rectangle classBounds) {
+		return bothLabels.x() - MARGIN_TO_NOT_BE_TOO_CLOSE > classBounds.x()
+				&& bothLabels.x() - MARGIN_TO_NOT_BE_TOO_CLOSE < classBounds.x() + classBounds.width();
+	}
+
+	/**
+	 * The method returns the "correct" x value of the label in order that the
+	 * multiplicity label do not intersect the class on the left anymore.
+	 * 
+	 * @param classBounds class bounds
+	 * @return the non-intersection x value
+	 */
+	protected int getXMultiplicityForIntersectOntheLeft(Rectangle classBounds) {
+		return classBounds.x() - getRoleMultiplicityWidth() + getRoleWidth()
+				- getDistanceBetweenClassAndLabelsWhenIntersect();
+	}
+
+	/**
+	 * The method returns the "correct" x value of the label in order that the
+	 * multiplicity label do not intersect the class on the right anymore.
+	 * 
+	 * @param classBounds class bounds
+	 * @return the non-intersection x value
+	 */
+	protected int getXMultiplicityForIntersectOntheRight(Rectangle classBounds) {
+		return classBounds.x() + classBounds.width() + getRoleWidth() + getDistanceBetweenClassAndLabelsWhenIntersect();
+	}
+
+	/**
+	 * The method returns the "correct" x value of the label in order that the role
+	 * label do not intersect the class on the left anymore.
+	 * 
+	 * @param classBounds class bounds
+	 * @return the non-intersection x value
+	 */
+	protected int getXRoleForIntersectOntheLeft(Rectangle classBounds) {
+		return classBounds.x() - getRoleMultiplicityWidth() - getDistanceBetweenClassAndLabelsWhenIntersect();
+	}
+
+	/**
+	 * The method returns the "correct" x value of the label in order that the role
+	 * label do not intersect the class on the right anymore.
+	 * 
+	 * @param classBounds class bounds
+	 * @return the non-intersection x value
+	 */
+	protected int getXRoleForIntersectOntheRight(Rectangle classBounds) {
+		return classBounds.x() + classBounds.width + getDistanceBetweenClassAndLabelsWhenIntersect();
+	}
+
+	/**
+	 * Gets the x value of the role label
+	 * 
+	 * @param bothLabels the whole label bounds
+	 * @return the x value
+	 * 
+	 */
+	protected int getBasicXRole(Rectangle bothLabels) {
+		return bothLabels.x();
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/AssociatedSourceSegment.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/AssociatedSourceSegment.java
new file mode 100644
index 0000000..51596fe
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/AssociatedSourceSegment.java
@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.PapyrusLabelHelper;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.AbstractAssociatedSegment;
+
+/**
+ * This class specializes this helper class (for geometric operations) for the
+ * segment related to the source class within the association. Once again, if it
+ * is not a multi-segmented association, the segment equals the association.
+ * However, in this case, the starting / end point will be inverted compared to
+ * the target associated segment.
+ */
+public class AssociatedSourceSegment extends AbstractAssociatedSegment {
+
+	/**
+	 * The object need the visual element (figure) and the whole association edit
+	 * part
+	 * 
+	 * @param target              the visual element
+	 * @param associationEditPart the whole manager of the association (the
+	 *                            association edit part)
+	 */
+	AssociatedSourceSegment(IFigure target, AssociationEditPart associationEditPart) {
+		super(target, associationEditPart);
+	}
+
+	/**
+	 * The point of intersection between the source class and the association
+	 */
+	public Point getStartingPoint() {
+		if (startingPoint == null) {
+			int[] pointList = PapyrusLabelHelper.getParentPointList(target).toIntArray();
+			startingPoint = new Point(pointList[0], pointList[1]);
+
+		}
+		return startingPoint;
+	}
+
+	/**
+	 * The end point of (association) segment attached to the source class  
+	 */
+	public Point getEndPoint() {
+		if (endPoint == null) {
+			int[] pointList = PapyrusLabelHelper.getParentPointList(target).toIntArray();
+			endPoint = new Point(pointList[2], pointList[3]);
+
+		}
+		return endPoint;
+	}
+
+	/**
+	 * The source class.
+	 */
+	public AbstractGraphicalEditPart getConnectedElement() {
+		return (AbstractGraphicalEditPart) this.associationEditPart.getSource();
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/MultiplicitySourceLabelLocator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/MultiplicitySourceLabelLocator.java
new file mode 100644
index 0000000..41b4dd4
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/MultiplicitySourceLabelLocator.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.AbstractAssociatedSegment;
+
+/**
+ * This class specializes the abstract label for the source multiplicity label.
+ * Main specialization: the relocate method.
+ *
+ */
+public class MultiplicitySourceLabelLocator extends AbstractSourceLabelLocator {
+
+	protected MultiplicitySourceLabelLocator(IFigure parent, Point offSet, int alignment, SourceLocatorFactory geoUtils) {
+		super(parent, offSet, alignment, geoUtils);
+	}
+
+	/**
+	 * Calculates the x and y of the source multiplicity label.
+	 */
+	@Override
+	public void relocate(IFigure target) {
+
+		AbstractAssociatedSegment associatedSegment = getAssociatedSegment(target);
+		Point distantPoint = associatedSegment.getThePointDistantOf(getDistanceBetweenClassAndLabels());
+
+		Rectangle bothLabels = getRectangleForBothLabels(distantPoint);
+
+		distantPoint.setX(getBasicXMultiplicity(bothLabels));
+		distantPoint.setY(getBasicYPosition(bothLabels));
+
+		Rectangle classBounds = getAssociatedElementBounds(associatedSegment);
+		if (areLabelsAtTheSameHeightThanAssociatedClass(bothLabels, classBounds)) {
+
+			if (doLabelsIntersectAssociatedClassOnTheLeft(bothLabels, classBounds)) {
+				distantPoint.setX(getXMultiplicityForIntersectOntheLeft(classBounds));
+			} else if (doLabelsIntersectAssociatedClassOnTheRight(bothLabels, classBounds)) {
+				distantPoint.setX(getXMultiplicityForIntersectOntheRight(classBounds));
+			}
+		}
+
+		target.setLocation(distantPoint);
+
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/RoleSourceLabelLocator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/RoleSourceLabelLocator.java
new file mode 100644
index 0000000..853d498
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/RoleSourceLabelLocator.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.AbstractAssociatedSegment;
+
+/**
+ * This class specializes the abstract label for the source role label.
+ * Main specialization: the relocate method.
+ */
+public class RoleSourceLabelLocator extends AbstractSourceLabelLocator {
+
+	RoleSourceLabelLocator(IFigure parent, Point offSet, int alignment, SourceLocatorFactory factory) {
+		super(parent, offSet, alignment, factory);
+	}
+
+	/**
+	 *Calculates the x and y of the source role label.
+	 */
+	@Override
+	public void relocate(IFigure target) {
+
+		AbstractAssociatedSegment associatedSegment = getAssociatedSegment(target);
+		Point distantPoint = associatedSegment.getThePointDistantOf(getDistanceBetweenClassAndLabels());
+
+		Rectangle bothLabels = getRectangleForBothLabels(distantPoint);
+
+		distantPoint.setX(getBasicXRole(bothLabels));
+		distantPoint.setY(getBasicYPosition(bothLabels));
+
+		Rectangle classBounds = getAssociatedElementBounds(associatedSegment);
+		if (areLabelsAtTheSameHeightThanAssociatedClass(bothLabels, classBounds)) {
+
+			if (doLabelsIntersectAssociatedClassOnTheLeft(bothLabels, classBounds)) {
+				distantPoint.setX(getXRoleForIntersectOntheLeft(classBounds));
+			} else if (doLabelsIntersectAssociatedClassOnTheRight(bothLabels, classBounds)) {
+				distantPoint.setX(getXRoleForIntersectOntheRight(classBounds));
+			}
+		}
+
+		target.setLocation(distantPoint);
+
+	}
+
+	
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/SourceLocatorFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/SourceLocatorFactory.java
new file mode 100644
index 0000000..8df8eff
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/locators/source/SourceLocatorFactory.java
@@ -0,0 +1,57 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+
+/**
+ * A factory for locators and associated segment 
+ *
+ */
+public class SourceLocatorFactory {
+
+	static SourceLocatorFactory singleton;
+	
+	public static SourceLocatorFactory getInstance () {
+		if (singleton==null) 
+			singleton = new SourceLocatorFactory();
+		return singleton;
+	}
+
+	public AssociatedSourceSegment createAssociatedSourceSegment(IFigure target,
+			AbstractSourceLabelLocator abstractLabel) {
+		return new AssociatedSourceSegment(target, abstractLabel.getAssociationFigure().getAssociationEditPart());
+	}
+
+	public AssociatedSourceSegment createAssociatedSourceSegment(IFigure target,
+			AssociationEditPart associationEditPart) {
+		return new AssociatedSourceSegment(target, associationEditPart);
+	}
+	
+	public MultiplicitySourceLabelLocator createMultiplicitySourceLabelLocator(IFigure parent, Point offSet,
+			int alignment) {
+		return new MultiplicitySourceLabelLocator(parent, offSet, alignment, this);
+	}
+
+	public RoleSourceLabelLocator createRoleSourceLabelLocator(IFigure parent, Point offSet, int alignment) {
+		return new RoleSourceLabelLocator(parent, offSet, alignment, this);
+	}
+	
+	
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/messages/Messages.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/messages/Messages.java
new file mode 100644
index 0000000..802889c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/messages/Messages.java
@@ -0,0 +1,38 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.messages.messages"; //$NON-NLS-1$
+	public static String Activator_CannotBeCastedIn;
+	public static String Activator_InMethod;
+	public static String Activator_IsNullInMethod;
+	public static String Activator_Parameter;
+	public static String Page_DescriptionOfThePlugIn;
+	
+	public static String Settings_activated;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/messages/messages.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/messages/messages.properties
new file mode 100644
index 0000000..dfc90bd
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/messages/messages.properties
@@ -0,0 +1,7 @@
+Activator_CannotBeCastedIn=\ cannot be casted in 
+Activator_InMethod=\ in method 
+Activator_IsNullInMethod=\ is null in method 
+Activator_Parameter=Parameter 
+Page_DescriptionOfThePlugIn=Use automatic layout for association labels (role and multiplicity)
+
+Settings_activated=activated
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/preferences/Page.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/preferences/Page.java
new file mode 100644
index 0000000..68add54
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/preferences/Page.java
@@ -0,0 +1,94 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.preferences;
+
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.messages.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * This class aims at displaying options for this plug-in in the preferences
+ * section of Eclipse/Papyrus.
+ *
+ */
+public class Page extends PreferencePage implements IWorkbenchPreferencePage {
+
+	public Page() {
+	}
+
+	public Page(String title) {
+		super(title);
+	}
+
+	public Page(String title, ImageDescriptor image) {
+		super(title, image);
+	}
+
+	@Override
+	public void init(IWorkbench workbench) {
+		// implement for legacy concern
+	}
+
+	/**
+	 * This method will create the graphical/form content for the label and checkbox for the option (activated).
+	 */
+	@Override
+	protected Control createContents(Composite parent) {
+
+		Composite content = new Composite(parent, SWT.NONE);
+		content.setLayout(new GridLayout(2, false));
+		Label label = new Label(content, SWT.NONE);
+		label.setText(Messages.Page_DescriptionOfThePlugIn);
+		Button check = new Button(content, SWT.CHECK);
+
+		boolean activated = Settings.getInstance().isActivated();
+		check.setSelection(activated);
+
+		check.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				boolean activated = check.getSelection();
+				Settings.getInstance().setActivated(activated);
+			}
+
+			@Override
+			public void mouseDown(MouseEvent e) {
+				// mouseDown reacts too late
+			}
+
+			@Override
+			public void mouseDoubleClick(MouseEvent e) {
+				// no reaction for double click
+
+			}
+		});
+
+		return content;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/preferences/Settings.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/preferences/Settings.java
new file mode 100644
index 0000000..391fde6
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/preferences/Settings.java
@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.preferences;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.messages.Messages;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * This class helps at accessing to eclipse configuration options related to
+ * this plug-in.
+ *
+ */
+public class Settings {
+
+	static Settings instance;
+
+	/**
+	 * The instance (singleton) that allows to access to the configuration options.
+	 *
+	 * @return
+	 */
+	public static Settings getInstance() {
+		if (instance == null) {
+			instance = new Settings();
+		}
+		return instance;
+	}
+
+	/**
+	 * Option: is the plug-in is on ?
+	 *
+	 * @return true if it is on.
+	 */
+	public boolean isActivated() {
+		return InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID).getBoolean(Messages.Settings_activated, true);
+	}
+
+	/**
+	 * set the Option: is the plug-in is on ?
+	 *
+	 * @param activated
+	 *            true to activate the plug-in.
+	 */
+	public void setActivated(boolean activated) {
+		IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+		preferences.putBoolean(Messages.Settings_activated, activated);
+		try {
+			preferences.flush();
+		} catch (BackingStoreException exception) {
+			Activator.getDefault().logError(exception.getMessage(), exception);
+		}
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/test.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/test.html
new file mode 100644
index 0000000..770e255
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout/test.html
@@ -0,0 +1,5 @@
+<HTML>
+<body>
+beeeen
+</body>
+</html>
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.classpath b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.classpath
new file mode 100644
index 0000000..f575ef3
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.project b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.project
new file mode 100644
index 0000000..155d153
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..dbda3b2
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=10
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/META-INF/MANIFEST.MF b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..4e0044c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Doc
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc.Activator
+Require-Bundle: org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-10
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc
+Bundle-ActivationPolicy: lazy
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/build.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/doc/Activator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/doc/Activator.java
new file mode 100644
index 0000000..7b78e44
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/doc/Activator.java
@@ -0,0 +1,22 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.doc;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}     
+ 
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.classpath b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.classpath
new file mode 100644
index 0000000..eca7bdb
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.project b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.project
new file mode 100644
index 0000000..04ae8a4
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.core.resources.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..896a9a5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.core.runtime.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..49ce3e3
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,317 @@
+eclipse.preferences.version=1
+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.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+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.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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=260
+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_additive_operator=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_bitwise_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_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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_relational_operator=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_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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_relational_operator=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_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+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=260
+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=5
+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=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.jdt.ui.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..ba7542e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+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\="true" 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 */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\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) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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 * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" 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}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${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=true
+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=true
+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=false
+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=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+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=true
+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=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+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=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_type_arguments=true
+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=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+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=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.pde.api.tools.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..b2260f8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Warning
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=Enabled
+changed_execution_env=Warning
+eclipse.preferences.version=1
+incompatible_api_component_version=Warning
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Error
+incompatible_api_component_version_report_minor_without_api_change=Error
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/META-INF/MANIFEST.MF b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3b8cdef
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Papyrus Class Diagram Auto Sizeable Classes
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="3.101.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="4.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="2.3.0",
+ org.eclipse.papyrus.editor;bundle-version="2.0.0",
+ org.eclipse.papyrus.uml.diagram.clazz,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="3.3.200",
+ org.eclipse.papyrus.infra.types.core,
+ org.junit,
+ org.junit.jupiter.api,
+ org.eclipse.gmf.runtime.common.core,
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime,
+ org.eclipse.gef,
+ org.mockito
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.adapters.notation;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.providers;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;x-internal:=true
+Bundle-ClassPath: .
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/about.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/about.html
new file mode 100644
index 0000000..ef2872f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/about.html
@@ -0,0 +1,28 @@
+<!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>November 30, 2017</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 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/build.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/build.properties
new file mode 100644
index 0000000..e92901e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
+jars.compile.order = .
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.di b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.di
new file mode 100644
index 0000000..8c549ee
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.notation b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.notation
new file mode 100644
index 0000000..1673327
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.notation
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Hk37kIxFEemmsN2NS74r5g" type="PapyrusUMLStateMachineDiagram" name="GeneralFunctioning" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_Hk37kYxFEemmsN2NS74r5g" type="StateMachine_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Hk37koxFEemmsN2NS74r5g" type="StateMachine_NameLabel">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hk37k4xFEemmsN2NS74r5g" width="791" height="16"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Hk37lIxFEemmsN2NS74r5g" type="StateMachine_RegionCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_Hk37lYxFEemmsN2NS74r5g" type="Region_Shape">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Hk37loxFEemmsN2NS74r5g" source="RegionAnnotationKey">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Hk37l4xFEemmsN2NS74r5g" key="RegionZoneKey" value=""/>
+        </eAnnotations>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Hk37mIxFEemmsN2NS74r5g" type="Region_SubvertexCompartment">
+          <children xmi:type="notation:Shape" xmi:id="_JdZjcIxFEemmsN2NS74r5g" type="Pseudostate_InitialShape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_JdZjcoxFEemmsN2NS74r5g" type="Pseudostate_InitialFloatingNameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_JdZjc4xFEemmsN2NS74r5g" y="-20"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_JdaKgIxFEemmsN2NS74r5g" type="Pseudostate_InitialStereotypeLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_JdaKgYxFEemmsN2NS74r5g" x="25" y="-10"/>
+            </children>
+            <element xmi:type="uml:Pseudostate" href="documentation.uml#_JdMvIIxFEemmsN2NS74r5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JdZjcYxFEemmsN2NS74r5g" x="29" y="34"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_AvWYwIxGEemmsN2NS74r5g" type="State_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_AvW_0IxGEemmsN2NS74r5g" type="State_NameLabel">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dqQB0IxGEemmsN2NS74r5g" width="101"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_AvW_0YxGEemmsN2NS74r5g" type="State_FloatingNameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_AvW_0oxGEemmsN2NS74r5g" x="40"/>
+            </children>
+            <children xmi:type="notation:BasicCompartment" xmi:id="_AvW_04xGEemmsN2NS74r5g" type="State_RegionCompartment">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AvW_1IxGEemmsN2NS74r5g" y="-1" width="101"/>
+            </children>
+            <element xmi:type="uml:State" href="documentation.uml#_AvPrEIxGEemmsN2NS74r5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AvWYwYxGEemmsN2NS74r5g" x="149" y="74" width="101"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_9gHKsIxHEemmsN2NS74r5g" type="State_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_9gHxwIxHEemmsN2NS74r5g" type="State_NameLabel">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gH4P8IxIEemmsN2NS74r5g" width="401" height="16"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_9gHxwYxHEemmsN2NS74r5g" type="State_FloatingNameLabel">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_9gHxwoxHEemmsN2NS74r5g" x="40"/>
+            </children>
+            <children xmi:type="notation:BasicCompartment" xmi:id="_9gHxw4xHEemmsN2NS74r5g" type="State_RegionCompartment">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gH2awIxIEemmsN2NS74r5g" source="PapyrusCSSForceValue">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gH2awYxIEemmsN2NS74r5g" key="visible" value="true"/>
+              </eAnnotations>
+              <children xmi:type="notation:Shape" xmi:id="_gH3o4IxIEemmsN2NS74r5g" type="Region_Shape">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gH3o5IxIEemmsN2NS74r5g" source="RegionAnnotationKey">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gH3o5YxIEemmsN2NS74r5g" key="RegionZoneKey" value=""/>
+                </eAnnotations>
+                <children xmi:type="notation:BasicCompartment" xmi:id="_gH3o4oxIEemmsN2NS74r5g" type="Region_SubvertexCompartment">
+                  <children xmi:type="notation:Shape" xmi:id="_gID2IIxIEemmsN2NS74r5g" type="State_Shape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_gIEdMYxIEemmsN2NS74r5g" type="State_NameLabel"/>
+                    <children xmi:type="notation:DecorationNode" xmi:id="_gIEdMoxIEemmsN2NS74r5g" type="State_FloatingNameLabel">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_gIEdM4xIEemmsN2NS74r5g" x="40"/>
+                    </children>
+                    <children xmi:type="notation:BasicCompartment" xmi:id="_gIEdNIxIEemmsN2NS74r5g" type="State_RegionCompartment">
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gIEdNYxIEemmsN2NS74r5g"/>
+                    </children>
+                    <element xmi:type="uml:State" href="documentation.uml#_gH43AIxIEemmsN2NS74r5g"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gIEdMIxIEemmsN2NS74r5g" x="299" y="64"/>
+                  </children>
+                  <children xmi:type="notation:Shape" xmi:id="_O7TZwIxJEemmsN2NS74r5g" type="Pseudostate_ChoiceShape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_O7UA0IxJEemmsN2NS74r5g" type="Pseudostate_ChoiceFloatingNameLabel">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_O7UA0YxJEemmsN2NS74r5g" x="50" y="3"/>
+                    </children>
+                    <children xmi:type="notation:DecorationNode" xmi:id="_O7UA0oxJEemmsN2NS74r5g" type="Pseudostate_ChoiceStereotypeLabel">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_O7UA04xJEemmsN2NS74r5g" x="25" y="-10"/>
+                    </children>
+                    <element xmi:type="uml:Pseudostate" href="documentation.uml#_O7IaoIxJEemmsN2NS74r5g"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O7TZwYxJEemmsN2NS74r5g" x="57" y="36" width="23"/>
+                  </children>
+                  <children xmi:type="notation:Shape" xmi:id="_lNPx0IxJEemmsN2NS74r5g" type="Pseudostate_ChoiceShape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_lNPx0oxJEemmsN2NS74r5g" type="Pseudostate_ChoiceFloatingNameLabel">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_lNQY4IxJEemmsN2NS74r5g" x="50" y="3"/>
+                    </children>
+                    <children xmi:type="notation:DecorationNode" xmi:id="_lNQY4YxJEemmsN2NS74r5g" type="Pseudostate_ChoiceStereotypeLabel">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_lNQY4oxJEemmsN2NS74r5g" x="25" y="-10"/>
+                    </children>
+                    <element xmi:type="uml:Pseudostate" href="documentation.uml#_lNEysIxJEemmsN2NS74r5g"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNPx0YxJEemmsN2NS74r5g" x="151" y="34" width="21"/>
+                  </children>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gH3o44xIEemmsN2NS74r5g"/>
+                </children>
+                <element xmi:type="uml:Region" href="documentation.uml#_gH3B0IxIEemmsN2NS74r5g"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gH3o4YxIEemmsN2NS74r5g" width="401" height="205"/>
+              </children>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9gHxxIxHEemmsN2NS74r5g" y="16" width="401" height="205"/>
+            </children>
+            <children xmi:type="notation:BasicCompartment" xmi:id="_9gOfcIxHEemmsN2NS74r5g" type="compartment_shape_display">
+              <styles xmi:type="notation:TitleStyle" xmi:id="_9gOfcYxHEemmsN2NS74r5g"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9gOfcoxHEemmsN2NS74r5g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_fOIkgIxIEemmsN2NS74r5g" type="Pseudostate_EntryPointShape">
+              <children xmi:type="notation:DecorationNode" xmi:id="_fOIkgoxIEemmsN2NS74r5g" type="Pseudostate_EntryPointFloatingNameLabel">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_fOIkg4xIEemmsN2NS74r5g" x="25" y="3"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_fOIkhIxIEemmsN2NS74r5g" type="Pseudostate_EntryPointStereotypeLabel">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_fOIkhYxIEemmsN2NS74r5g" x="25" y="-10"/>
+              </children>
+              <element xmi:type="uml:Pseudostate" href="documentation.uml#_fOABoIxIEemmsN2NS74r5g"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fOIkgYxIEemmsN2NS74r5g" x="-10" y="50"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="__xH5IIxJEemmsN2NS74r5g" type="Pseudostate_ExitPointShape">
+              <children xmi:type="notation:DecorationNode" xmi:id="__xH5IoxJEemmsN2NS74r5g" type="Pseudostate_ExitPointFloatingNameLabel">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="__xIgMIxJEemmsN2NS74r5g" x="25" y="3"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="__xIgMYxJEemmsN2NS74r5g" type="Pseudostate_ExitPointStereotypeLabel">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="__xIgMoxJEemmsN2NS74r5g" x="25" y="-10"/>
+              </children>
+              <element xmi:type="uml:Pseudostate" href="documentation.uml#__w4okIxJEemmsN2NS74r5g"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="__xH5IYxJEemmsN2NS74r5g" x="391" y="49"/>
+            </children>
+            <element xmi:type="uml:State" href="documentation.uml#_9f_18IxHEemmsN2NS74r5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9gHKsYxHEemmsN2NS74r5g" x="269" y="134" width="401" height="221"/>
+          </children>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hk37mYxFEemmsN2NS74r5g"/>
+        </children>
+        <element xmi:type="uml:Region" href="documentation.uml#_Hkx08IxFEemmsN2NS74r5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hk37moxFEemmsN2NS74r5g" width="791" height="395"/>
+      </children>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hk37m4xFEemmsN2NS74r5g" y="16" width="791" height="395"/>
+    </children>
+    <element xmi:type="uml:StateMachine" href="documentation.uml#_9OFG4IxEEemmsN2NS74r5g"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hk37nIxFEemmsN2NS74r5g" x="30" y="30" width="791" height="411"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_Hk37nYxFEemmsN2NS74r5g" name="diagram_compatibility_version" stringValue="1.4.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_Hk37noxFEemmsN2NS74r5g"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Hk37n4xFEemmsN2NS74r5g" diagramKindId="org.eclipse.papyrus.uml.diagram.stateMachine">
+    <owner xmi:type="uml:Model" href="documentation.uml#_5Ln-EIxEEemmsN2NS74r5g"/>
+  </styles>
+  <element xmi:type="uml:StateMachine" href="documentation.uml#_9OFG4IxEEemmsN2NS74r5g"/>
+  <edges xmi:type="notation:Connector" xmi:id="_iYdn8IxHEemmsN2NS74r5g" type="Transition_Edge" source="_JdZjcIxFEemmsN2NS74r5g" target="_AvWYwIxGEemmsN2NS74r5g">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iYdn84xHEemmsN2NS74r5g" type="Transition_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qI10AIxHEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iYdn9IxHEemmsN2NS74r5g" x="34" y="-46"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iYdn9YxHEemmsN2NS74r5g" type="Transition_GuardLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qI76oIxHEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iYdn9oxHEemmsN2NS74r5g" x="-2" y="10"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iYdn94xHEemmsN2NS74r5g" type="Transition_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qJCBQIxHEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iYdn-IxHEemmsN2NS74r5g" x="-1" y="58"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_iYdn8YxHEemmsN2NS74r5g"/>
+    <element xmi:type="uml:Transition" href="documentation.uml#_iYUeAIxHEemmsN2NS74r5g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iYdn8oxHEemmsN2NS74r5g" points="[78, 91, -643984, -643984]$[120, 100, -643984, -643984]$[180, 140, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iYsRcIxHEemmsN2NS74r5g" id="(0.9,0.55)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iYsRcYxHEemmsN2NS74r5g" id="(0.0,0.5)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_GgLdAIxIEemmsN2NS74r5g" type="Transition_Edge" source="_AvWYwIxGEemmsN2NS74r5g" target="_9gHKsIxHEemmsN2NS74r5g">
+    <children xmi:type="notation:DecorationNode" xmi:id="_GgLdA4xIEemmsN2NS74r5g" type="Transition_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_HwOvoIxIEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_GgLdBIxIEemmsN2NS74r5g" x="23" y="-15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_GgLdBYxIEemmsN2NS74r5g" type="Transition_GuardLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_HwWEYIxIEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_GgLdBoxIEemmsN2NS74r5g"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_GgLdB4xIEemmsN2NS74r5g" type="Transition_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_HwdZIIxIEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_GgLdCIxIEemmsN2NS74r5g" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_GgLdAYxIEemmsN2NS74r5g"/>
+    <element xmi:type="uml:Transition" href="documentation.uml#_GgCTEIxIEemmsN2NS74r5g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GgLdAoxIEemmsN2NS74r5g" points="[281, 140, -643984, -643984]$[420, 140, -643984, -643984]$[360, 180, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GgdJ0IxIEemmsN2NS74r5g" id="(1.0,0.5)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GgdJ0YxIEemmsN2NS74r5g" id="(0.5607476635514018,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_TSYHsIxJEemmsN2NS74r5g" type="Transition_Edge" source="_fOIkgIxIEemmsN2NS74r5g" target="_O7TZwIxJEemmsN2NS74r5g">
+    <children xmi:type="notation:DecorationNode" xmi:id="_TSYuwIxJEemmsN2NS74r5g" type="Transition_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xs_44IxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TSYuwYxJEemmsN2NS74r5g" x="4" y="16"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_TSYuwoxJEemmsN2NS74r5g" type="Transition_GuardLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XtJC0IxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TSYuw4xJEemmsN2NS74r5g"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_TSYuxIxJEemmsN2NS74r5g" type="Transition_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XtUB8IxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TSYuxYxJEemmsN2NS74r5g" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_TSYHsYxJEemmsN2NS74r5g"/>
+    <element xmi:type="uml:Transition" href="documentation.uml#_TSNIkIxJEemmsN2NS74r5g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TSYHsoxJEemmsN2NS74r5g" points="[310, 240, -643984, -643984]$[348, 240, -643984, -643984]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TSwiMIxJEemmsN2NS74r5g" id="(0.1951219512195122,0.45)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_fQHFAIxJEemmsN2NS74r5g" type="Transition_Edge" source="_O7TZwIxJEemmsN2NS74r5g" target="_lNPx0IxJEemmsN2NS74r5g">
+    <children xmi:type="notation:DecorationNode" xmi:id="_fQHFA4xJEemmsN2NS74r5g" type="Transition_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_paaV0IxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fQHFBIxJEemmsN2NS74r5g" x="-1" y="15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_fQHFBYxJEemmsN2NS74r5g" type="Transition_GuardLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pakt4IxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fQHFBoxJEemmsN2NS74r5g"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_fQHFB4xJEemmsN2NS74r5g" type="Transition_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_paw7IIxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fQHFCIxJEemmsN2NS74r5g" x="1" y="59"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_fQHFAYxJEemmsN2NS74r5g"/>
+    <element xmi:type="uml:Transition" href="documentation.uml#_fP7e0IxJEemmsN2NS74r5g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fQHFAoxJEemmsN2NS74r5g" points="[388, 236, -643984, -643984]$[480, 240, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fQe4cIxJEemmsN2NS74r5g" id="(0.9024390243902439,0.4)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fQe4cYxJEemmsN2NS74r5g" id="(0.0,0.5)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_uDpKwIxJEemmsN2NS74r5g" type="Transition_Edge" source="_lNPx0IxJEemmsN2NS74r5g" target="_gID2IIxIEemmsN2NS74r5g">
+    <children xmi:type="notation:DecorationNode" xmi:id="_uDpx0IxJEemmsN2NS74r5g" type="Transition_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3DFyAIxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uDpx0YxJEemmsN2NS74r5g" x="-12" y="13"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uDpx0oxJEemmsN2NS74r5g" type="Transition_GuardLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3DQKEIxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uDpx04xJEemmsN2NS74r5g"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uDpx1IxJEemmsN2NS74r5g" type="Transition_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3Dc-YIxJEemmsN2NS74r5g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uDpx1YxJEemmsN2NS74r5g" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_uDpKwYxJEemmsN2NS74r5g"/>
+    <element xmi:type="uml:Transition" href="documentation.uml#_uDeLoIxJEemmsN2NS74r5g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uDpKwoxJEemmsN2NS74r5g" points="[473, 240, -643984, -643984]$[500, 280, -643984, -643984]$[580, 260, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uEDacIxJEemmsN2NS74r5g" id="(0.38095238095238093,0.9)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uEDacYxJEemmsN2NS74r5g" id="(0.0,0.5)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_C8zK8IxKEemmsN2NS74r5g" type="Transition_Edge" source="_lNPx0IxJEemmsN2NS74r5g" target="__xH5IIxJEemmsN2NS74r5g">
+    <children xmi:type="notation:DecorationNode" xmi:id="_C8zK84xKEemmsN2NS74r5g" type="Transition_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_C8zK9IxKEemmsN2NS74r5g" x="-4" y="-8"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_C8zK9YxKEemmsN2NS74r5g" type="Transition_GuardLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_C8zK9oxKEemmsN2NS74r5g"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_C8zK94xKEemmsN2NS74r5g" type="Transition_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_C8zK-IxKEemmsN2NS74r5g" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_C8zK8YxKEemmsN2NS74r5g"/>
+    <element xmi:type="uml:Transition" href="documentation.uml#_C8oL0IxKEemmsN2NS74r5g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C8zK8oxKEemmsN2NS74r5g" points="[473, 240, -643984, -643984]$[699, 229, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C9MMgIxKEemmsN2NS74r5g" id="(1.0,0.5)"/>
+  </edges>
+</notation:Diagram>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.uml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.uml
new file mode 100644
index 0000000..5b8388b
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/models/documentation.uml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_5Ln-EIxEEemmsN2NS74r5g" name="documentation">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_5a6-UIxEEemmsN2NS74r5g">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:StateMachine" xmi:id="_9OFG4IxEEemmsN2NS74r5g" name="StateMachine2">
+    <region xmi:type="uml:Region" xmi:id="_Hkx08IxFEemmsN2NS74r5g" name="Region1">
+      <transition xmi:type="uml:Transition" xmi:id="_iYUeAIxHEemmsN2NS74r5g" name="Mouse's left button pressed on an toolbar icon" source="_JdMvIIxFEemmsN2NS74r5g" target="_AvPrEIxGEemmsN2NS74r5g"/>
+      <transition xmi:type="uml:Transition" xmi:id="_GgCTEIxIEemmsN2NS74r5g" name="One mouse move (left button still pressed)" source="_AvPrEIxGEemmsN2NS74r5g" target="_9f_18IxHEemmsN2NS74r5g"/>
+      <transition xmi:type="uml:Transition" xmi:id="_TSNIkIxJEemmsN2NS74r5g" name="move over" source="_fOABoIxIEemmsN2NS74r5g" target="_O7IaoIxJEemmsN2NS74r5g"/>
+      <subvertex xmi:type="uml:Pseudostate" xmi:id="_JdMvIIxFEemmsN2NS74r5g" name=""/>
+      <subvertex xmi:type="uml:State" xmi:id="_AvPrEIxGEemmsN2NS74r5g" name="PreparedToCreate"/>
+      <subvertex xmi:type="uml:State" xmi:id="_9f_18IxHEemmsN2NS74r5g" name="DealingWithMouseMovingOverAClassDiagram">
+        <connectionPoint xmi:type="uml:Pseudostate" xmi:id="_fOABoIxIEemmsN2NS74r5g" name="" kind="entryPoint"/>
+        <connectionPoint xmi:type="uml:Pseudostate" xmi:id="__w4okIxJEemmsN2NS74r5g" name="" kind="exitPoint"/>
+        <region xmi:type="uml:Region" xmi:id="_gH3B0IxIEemmsN2NS74r5g" name="Region2">
+          <transition xmi:type="uml:Transition" xmi:id="_fP7e0IxJEemmsN2NS74r5g" name="nothing" source="_O7IaoIxJEemmsN2NS74r5g" target="_lNEysIxJEemmsN2NS74r5g"/>
+          <transition xmi:type="uml:Transition" xmi:id="_uDeLoIxJEemmsN2NS74r5g" name="[a class was preivously expanded]" source="_lNEysIxJEemmsN2NS74r5g" target="_gH43AIxIEemmsN2NS74r5g"/>
+          <transition xmi:type="uml:Transition" xmi:id="_C8oL0IxKEemmsN2NS74r5g" name="[no class was previously expanded" source="_lNEysIxJEemmsN2NS74r5g" target="__w4okIxJEemmsN2NS74r5g"/>
+          <subvertex xmi:type="uml:State" xmi:id="_gH43AIxIEemmsN2NS74r5g" name="State1"/>
+          <subvertex xmi:type="uml:Pseudostate" xmi:id="_O7IaoIxJEemmsN2NS74r5g" name=" " kind="choice"/>
+          <subvertex xmi:type="uml:Pseudostate" xmi:id="_lNEysIxJEemmsN2NS74r5g" name=" " kind="choice"/>
+        </region>
+      </subvertex>
+    </region>
+  </packagedElement>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_MH5lYIxGEemmsN2NS74r5g">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MH6zgIxGEemmsN2NS74r5g" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+  </profileApplication>
+</uml:Model>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/plugin.xml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/plugin.xml
new file mode 100644
index 0000000..968c329
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/plugin.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+      <editpolicyProvider
+            class="org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.providers.MouseCreationEditPolicyProvider">
+         <Priority
+               name="Lowest">
+         </Priority>
+      </editpolicyProvider>
+   </extension>
+   <extension
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.product"
+            name="PreferenceAutoSizeableClasses">
+      </product>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Page"
+            id="org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference_page"
+            name="Automatic Collapsable-Expandable classes">
+      </page>
+   </extension>
+
+</plugin>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/Activator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/Activator.java
new file mode 100644
index 0000000..39e0bde
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/Activator.java
@@ -0,0 +1,137 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.messages.Messages;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	private LogHelper myLogHelper;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+		// this constructor is required to implement the extension point. 
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Logs an error through a message (param)
+	 * @param error
+	 */
+	public void logError(String error) {
+		getLogHelper().warn(error);
+	}
+
+	/**
+	 * Logs an error through a message and an exception (params)
+	 * @param error
+	 * @param throwable
+	 */
+	public void logError(String error, Throwable throwable) {
+		getLogHelper().error(error, throwable);
+	}
+
+	/**
+	 * Logs an information through a message (param)
+	 * @param message
+	 */
+	public void logInfo(String message) {
+		getLogHelper().info(message);
+	}
+
+	/**
+	 * Logs an information through a message and an exception (params)
+	 * @param message
+	 * @param throwable
+	 */
+	public void logInfo(String message, Throwable throwable) {
+		getLogHelper().error(message, throwable);
+	}
+
+	/**
+	 * Gets the LogHelper
+	 * @return
+	 */
+	public LogHelper getLogHelper() {
+		if (myLogHelper==null) {
+			myLogHelper=new LogHelper(getDefault());
+		}
+		return myLogHelper;
+	}
+
+	public void logNullParameter(String parameterName) {
+		getLogHelper().warn(Messages.Activator_Parameter+parameterName+Messages.Activator_IsNullInMethod+getMethodName(4));
+	}
+	
+	public void logNullParameter(String parameterName, int deep) {
+		getLogHelper().warn(Messages.Activator_Parameter+parameterName+Messages.Activator_IsNullInMethod+getMethodName(deep));
+	}
+	
+	public void logCastProblem(String variableName, Class targetCastClass, int deep) {
+		getLogHelper().warn(variableName+Messages.Activator_CannotBeCastedIn+targetCastClass.getName()+Messages.Activator_InMethod+getMethodName(deep));
+	}
+	
+	public void logCastProblem(String variableName, Class targetCastClass) {
+		getLogHelper().warn(variableName+Messages.Activator_CannotBeCastedIn+targetCastClass.getName()+Messages.Activator_InMethod+getMethodName(3));
+	}
+	
+	/**
+	 * Get the method name for a depth in call stack. <br />
+	 * Utility function
+	 * @param depth depth in the call stack (0 means current method, 1 means call method, ...)
+	 * @return method name
+	 */
+	public static String getMethodName(int deep)
+	{
+	  final StackTraceElement[] ste = Thread.currentThread().getStackTrace();
+	  return ste[deep].getMethodName()+" ("+ste[deep].getClassName()+")"; 
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/adapters/notation/ContainerAdapter.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/adapters/notation/ContainerAdapter.java
new file mode 100644
index 0000000..c08f3e6
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/adapters/notation/ContainerAdapter.java
@@ -0,0 +1,156 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.adapters.notation;
+
+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.ecore.util.EContentAdapter;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.CSSShapeImpl;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractPackageableElementCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ClassExpanderCollapser;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.FakeSettings;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+
+public class ContainerAdapter extends EContentAdapter {
+
+	private Notifier containerCreator = null;
+
+	public ContainerAdapter(ModelEditPart modelEditPart) {
+		
+		this.containerCreator = Notifier.class.cast(modelEditPart.getModel());
+		for (Adapter adapter : containerCreator.eAdapters()) {
+			if (adapter instanceof ContainerAdapter) {
+				return;
+			}
+		}
+		containerCreator.eAdapters().add(this);
+	}
+	
+	public ContainerAdapter(AbstractPackageableElementCompartmentEditPart packageCompartmentEditPart) {
+		this.containerCreator = Notifier.class.cast(packageCompartmentEditPart.getModel());
+		for (Adapter adapter : containerCreator.eAdapters()) {
+			if (adapter instanceof ContainerAdapter) {
+				return;
+			}
+		}
+		containerCreator.eAdapters().add(this);
+	}
+	
+	@Override
+	public void notifyChanged(Notification notification) {
+		super.notifyChanged(notification);
+		processIfCompartmentInvolved(notification);
+	}
+
+	private void processIfCompartmentInvolved(Notification notification) {
+		if ((isDeletion(notification) || isAddition(notification))
+				&& (notification.getNotifier() instanceof BasicCompartment)) {
+			BasicCompartment compartment = (BasicCompartment) notification.getNotifier();
+			processChangeInCompartment(notification, compartment);
+		}
+	}
+
+	private void processChangeInCompartment(Notification notification, BasicCompartment compartment) {
+		if (compartment.eContainer() instanceof CSSShapeImpl) {
+			CSSShapeImpl container = (CSSShapeImpl) compartment.eContainer();
+			if (container.getType().equals(ClassEditPart.VISUAL_ID)
+					|| container.getType().equals(ClassEditPartCN.VISUAL_ID)
+					|| container.getType()
+							.equals(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart.VISUAL_ID)
+					|| container.getType()
+							.equals(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN.VISUAL_ID)) {
+				if ((isDeletion(notification) && isAConcernedValue(notification.getOldValue()))
+						|| (isAddition(notification) && isAConcernedValue(notification.getNewValue()))) {
+					expandCollapseClass(isDeletion(notification), container, compartment);
+				}
+			}
+		}
+	}
+
+	private boolean isAConcernedValue(Object newValue) {
+		if (newValue instanceof View) {
+			View shape = (View) newValue;
+			String type = shape.getType();
+			if (type.equals(PropertyForClassEditPart.VISUAL_ID) 
+					|| type.equals(OperationForClassEditPart.VISUAL_ID)
+					|| type.equals(NestedClassForClassEditPart.VISUAL_ID)
+					|| type.equals(ClassEditPartCN.VISUAL_ID)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private boolean isDeletion(Notification notification) {
+		return (notification.getEventType() == Notification.REMOVE
+				|| notification.getEventType() == Notification.REMOVE_MANY);
+	}
+
+	private boolean isAddition(Notification notification) {
+		return (notification.getEventType() == Notification.ADD
+				|| notification.getEventType() == Notification.ADD_MANY);
+	}
+
+	private void expandCollapseClass(boolean collapse, CSSShapeImpl container, BasicCompartment compartment) {
+		int concernedCompartment = -1;
+		if (compartment.getType().equals(ClassAttributeCompartmentEditPart.VISUAL_ID)
+				|| compartment.getType().equals(ClassAttributeCompartmentEditPartCN.VISUAL_ID)) {
+			concernedCompartment = ConcernedCompartment.PROPERTIES;
+		}
+
+		else if (compartment.getType().equals(ClassOperationCompartmentEditPart.VISUAL_ID)
+				|| compartment.getType().equals(ClassOperationCompartmentEditPartCN.VISUAL_ID)) {
+			concernedCompartment = ConcernedCompartment.OPERATIONS;
+		}
+
+		else if (compartment.getType().equals(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)
+				|| compartment.getType().equals(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)) {
+			concernedCompartment = ConcernedCompartment.NESTED_CLASSES;
+		}
+
+		if (concernedCompartment != -1) {
+			org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ClassExpanderCollapsertFactory factory = org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ClassExpanderCollapsertFactory
+					.getInstance();
+			ClassExpanderCollapser expandCollapse = factory.createExpandingCollapsing(container, concernedCompartment,
+					new FakeSettings(Settings.getInstance().isActivated(), Settings.getInstance().keepsCreationSize(),
+							true));
+			if (collapse) {
+				expandCollapse.collapseIfPossible();
+			}
+			else {
+				expandCollapse.expandIfPossible();
+			}
+		}
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/ContainerEditPolicy.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/ContainerEditPolicy.java
new file mode 100644
index 0000000..1082a0d
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/ContainerEditPolicy.java
@@ -0,0 +1,308 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.UmlClassResizer;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+
+/**
+ * This is an edit policy that inherits from
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy}
+ * and dedicated to process request / hovering events for the class diagram
+ * itself or packages.
+ * 
+ */
+
+public class ContainerEditPolicy extends HoveringElementEditPolicy {
+
+	private static final int HEIGHT_OF_A_NON_COMPARTMENTED_CLASS = 30;
+
+	/**
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy#PolicyToInheritFrom(EditPart)}
+	 * 
+	 * @param editPart edit part which the edit policy is associated to
+	 */
+
+	public ContainerEditPolicy(EditPart editPart) {
+		super(editPart);
+	}
+
+	/**
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy}
+	 * for global explanation of edit policy and this method. Short summary:
+	 * intercept a move (during a creation/drop interaction) over the associated
+	 * graphical element
+	 * 
+	 * @param request the request corresponding to the interaction event
+	 */
+
+	@Override
+	public Command getCommand(Request request) {
+		if (Settings.getInstance().isActivated() && isCreationOrDropRequest(request)) {
+			setCurrentRequest(request);
+			getStateMachine().getLowEventManager().hoveringSomethingButAClass(editPart);
+		}
+		return super.getCommand(request);
+	}
+
+	/**
+	 * This method is called for request about creating something. As this edit
+	 * policy is associated to UML Class, it is for creation of uml classes. The
+	 * implementation of this inherited method is to add some behavior in the
+	 * creation of class:
+	 * <UL>
+	 * <LI>hide each compartment of the class</LI>
+	 * <LI>Keep the height of the class at a certain value (except if the keeping
+	 * creation size option is on).</LI>
+	 * </UL>
+	 * To do this, 2 commands are inserted in the global creation command:
+	 * <UL>
+	 * <LI>one, inserted at the beginning, for adding a adapter that listens the
+	 * next creation in the related class diagram, in order to get a reference on
+	 * the newly create class (notation level) and to listen to every update
+	 * operations on it</LI>
+	 * <LI>one, inserted at the end, for adding a adapter that detects one of the
+	 * last operations: changing the height of the class. The goal is to keep at a
+	 * certain value (or not).</LI>
+	 * </UL>
+	 * 
+	 */
+	@Override
+	protected Command getCreateCommand(CreateViewRequest request) {
+		if (Settings.getInstance().isActivated()
+				&& request.getViewDescriptors().get(0).getSemanticHint().startsWith("Class_")
+				&& editPart.getModel() instanceof Notifier) {
+			
+			final Notifier container = Notifier.class.cast(editPart.getModel());
+			final AdapterToHideCompartmentOfAUmlClass compartmentListener = new AdapterToHideCompartmentOfAUmlClass();
+			final AdapterForMemorizeTheNewClass listener = new AdapterForMemorizeTheNewClass(compartmentListener);
+			final AdapterToSetMyHeight heightListener = new AdapterToSetMyHeight(request.getSize() != null);
+
+			// listenClassDiagramToDetectTheCreatedClass
+			Command firstCommand = commandToDetectACreationOfAClass(container, listener);
+			
+
+			// listenTheClassBoundsToDetectTheChangeOfHeight
+			Command lastCommand = commandToDetectChangeOfHeight(container, listener, compartmentListener,
+					heightListener);
+			
+			// command that create the class and its components, and bounds it.
+			Command command = super.getCreateCommand(request);
+			
+			return firstCommand.chain(command).chain(lastCommand);
+		} else {
+			return super.getCreateCommand(request);
+		}
+
+	}
+
+	// This method creates a command, located at the beginning, in which an adapter
+	// will be added to the class
+	// diagram to detect the next creation of a class
+
+	private Command commandToDetectACreationOfAClass(final Notifier container,
+			final AdapterForMemorizeTheNewClass listener) {
+		return new Command() {
+			@Override
+			public boolean canExecute() {
+				return true;
+			}
+
+			@Override
+			public void execute() {
+				container.eAdapters().add(listener);
+			}
+		};
+	}
+
+	// This method creates a command, located at the end, in which an adapter will
+	// be added to size part to the class
+	// in order to detect the resize of the class (one of the last operation of
+	// creation process).
+
+	private Command commandToDetectChangeOfHeight(final Notifier container,
+			final AdapterForMemorizeTheNewClass listener, final AdapterToHideCompartmentOfAUmlClass compartmentListener,
+			AdapterToSetMyHeight heightListener) {
+		
+		return new Command() {
+			@Override
+			public boolean canExecute() {
+				return true;
+			}
+
+			@Override
+			public void execute() {
+
+				container.eAdapters().remove(listener);
+				if (compartmentListener.theClass != null) {
+					compartmentListener.theClass.eAdapters().remove(compartmentListener);
+				}
+
+				if (listener.theClass != null) {
+					listener.theClass.getLayoutConstraint().eAdapters().add(heightListener);
+				}
+			}
+
+		};
+	}
+
+	/**
+	 * This class defines an adapter that will listen the class diagram in order to
+	 * detect the creation of the new class (notation level). When it detects such
+	 * event, it associates an adapter (listener) to the new class in order to hide
+	 * each new compartment that will be added to it.
+	 *
+	 */
+	protected class AdapterForMemorizeTheNewClass extends AdapterImpl {
+		private Node theClass;
+
+		/**
+		 * The future adapter that will listen each newly created class in order to hide
+		 * each new compartment that will be added to the class (notation level).
+		 */
+		private AdapterToHideCompartmentOfAUmlClass classListener;
+
+		public AdapterForMemorizeTheNewClass(AdapterToHideCompartmentOfAUmlClass classListener) {
+			this.classListener = classListener;
+		}
+
+		/**
+		 * This implementation of the notifyChanged method aims at adding the "hide
+		 * compartment adapter" to each newly created class.
+		 */
+		@Override
+		public void notifyChanged(Notification notification) {
+			Object value = notification.getNewValue();
+			if (value instanceof Node) {
+				theClass = Node.class.cast(value);
+				if (theClass.getType().equals(ClassEditPart.VISUAL_ID) ||
+						theClass.getType().equals(ClassEditPartCN.VISUAL_ID)) {
+					classListener.theClass = theClass;
+					theClass.eAdapters().add(classListener);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This class aims at listening classes (notation level) from the very beginning
+	 * of their life cycle (before their components are created) in order to hide
+	 * each compartment that will be created and added to the class.
+	 *
+	 */
+	protected class AdapterToHideCompartmentOfAUmlClass extends AdapterImpl {
+		protected Node theClass;
+
+		/**
+		 * This implementation of the notifyChanged method aims at hiding compartment
+		 * when they are added to the class
+		 * 
+		 */
+		@Override
+		public void notifyChanged(Notification notification) {
+			if (notification.getNewValue() instanceof BasicCompartment
+					&& notification.getEventType() == Notification.ADD) {
+				hideCompartment(BasicCompartment.class.cast(notification.getNewValue()));
+			}
+		}
+	}
+
+	/**
+	 * This class aims at listening classes (notation level) from the very beginning
+	 * of their life cycle (before their components are created) in order to that
+	 * height of the class remains at the value set by the constant
+	 * HEIGHT_OF_A_NON_COMPARTMENTED_CLASS. The height is changed at the end of the
+	 * creation of a class (notation level): so this adapter will act only once.
+	 *
+	 */
+	protected class AdapterToSetMyHeight extends AdapterImpl {
+		private LayoutConstraint layoutConstraint;
+		boolean aSpecificSizeHasBeenProposed;
+
+		public AdapterToSetMyHeight(boolean aSpecificSizeHasBeenProposed) {
+			this.aSpecificSizeHasBeenProposed = aSpecificSizeHasBeenProposed;
+		}
+
+		/**
+		 * This implementation of the notifyChanged method aims at bringing the height
+		 * at HEIGHT_OF_A_NON_COMPARTMENTED_CLASS when the height is being changed (at
+		 * the end of the creation of the class). As the modification of the height
+		 * happens once, the adapter is removed after it has acted.
+		 */
+		@Override
+		public void notifyChanged(Notification notification) {
+			if (!(Settings.getInstance().keepsCreationSize() && aSpecificSizeHasBeenProposed
+					&& notification.getNotifier() instanceof LayoutConstraint)) {
+				layoutConstraint = LayoutConstraint.class.cast(notification.getNotifier());
+
+				if (notification.getFeature() == NotationPackage.eINSTANCE.getSize_Height()) {
+					layoutConstraint.eAdapters().remove(this);
+					try {
+						UmlClassResizer.getInstance().resizeHeight(layoutConstraint,
+								HEIGHT_OF_A_NON_COMPARTMENTED_CLASS);
+					} catch (ServiceException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This method is used by the adapter that hiding compartment in order to...
+	 * hide a compartment.
+	 * 
+	 * @param compartment the compartment to hide.
+	 */
+	protected void hideCompartment(BasicCompartment compartment) {
+		try {
+			TransactionalEditingDomain editingDomain = ServiceUtilsForEObject.getInstance()
+					.getTransactionalEditingDomain(compartment);
+			RecordingCommand command = new RecordingCommand(editingDomain, "hide compartment") {
+
+				@Override
+				protected void doExecute() {
+					compartment.setVisible(false);
+				}
+
+			};
+			editingDomain.getCommandStack().execute(command);
+		} catch (ServiceException exception) {
+			Activator.getDefault().logError(exception.getMessage(), exception);
+		}
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/EditPolicyFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/EditPolicyFactory.java
new file mode 100644
index 0000000..078cfc2
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/EditPolicyFactory.java
@@ -0,0 +1,90 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies;
+
+import org.eclipse.gef.EditPart;
+
+/**
+ * This class is aims at providing a factory for the edit policies associated to
+ * this plug)in.
+ *
+ */
+public class EditPolicyFactory {
+
+	private static final EditPolicyFactory INSTANCE=new EditPolicyFactory();
+
+	/**
+	 * This method return the factory singleton.
+	 * 
+	 * @return instance (singleton) to used as the factory
+	 */
+	public static EditPolicyFactory getInstance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Factory method to create an instance of
+	 * PolicyForUmlClassComponentPotentiallyHideable
+	 * 
+	 * @param editPart the edit part, which will be required to access to the
+	 *                 graphical element concerned by the edit policy.
+	 * @return an instance of PolicyForUmlClassComponentPotentiallyHideable
+	 */
+	public HideableClassElementEditPolicy createHideableClassElementEditPolicy(
+			EditPart editPart) {
+		return new HideableClassElementEditPolicy(editPart);
+	}
+
+	/**
+	 * Factory method to create an instance of
+	 * PolicyForUmlClassComponentNotHideable
+	 * 
+	 * @param editPart the edit part, which will be required to access to the
+	 *                 graphical element concerned by the edit policy.
+	 * @return an instance of PolicyForUmlClassComponentNotHideable
+	 */
+	public NotHideableClassElementEditPolicy createNotHideableClassElementEditPolicy(EditPart editPart) {
+		return new NotHideableClassElementEditPolicy(editPart);
+	}
+
+	/**
+	 * Factory method to create an instance of
+	 * PolicyForUmlClassDiagram
+	 * 
+	 * @param editPart the edit part, which will be required to access to the
+	 *                 graphical element concerned by the edit policy.
+	 * @return an instance of PolicyForUmlClassDiagram
+	 */
+	public ContainerEditPolicy createContainerEditPolicy(EditPart editPart) {
+		return new ContainerEditPolicy(editPart);
+	}
+
+	/**
+	 * 
+	 * Factory method to create an instance of
+	 * PolicyForAnythingInClassDiagramButClassAndItsComponents
+	 * 
+	 * @param editPart the edit part, which will be required to access to the
+	 *                 graphical element concerned by the edit policy.
+	 * @return an instance of PolicyForAnythingInClassDiagramButClassAndItsComponents
+	 */
+	public NotAClassEditPolicy createNotAClassEditPolicy(
+			EditPart editPart) {
+		return new NotAClassEditPolicy(editPart);
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/HideableClassElementEditPolicy.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/HideableClassElementEditPolicy.java
new file mode 100644
index 0000000..ae55d6c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/HideableClassElementEditPolicy.java
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+
+/**
+ * This is an edit policy that inherits from
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy}
+ * and dedicated to process request / hovering events for elements of an uml
+ * class that can potentially be collapsed or expanded.
+ * 
+ */
+
+public class HideableClassElementEditPolicy extends HoveringElementEditPolicy {
+
+	/**
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy#PolicyToInheritFrom(EditPart)}
+	 * 
+	 * @param editPart edit part which the edit policy is associated to
+	 */
+
+	public HideableClassElementEditPolicy(EditPart editPart) {
+		super(editPart);
+	}
+
+	/**
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy}
+	 * for global explanation of edit policy and this method. Short summary:
+	 * intercept a move (during a creation/drop interaction) over the associated
+	 * graphical element
+	 * 
+	 * @param request the request corresponding to the interaction event
+	 */
+
+	@Override
+	public Command getCommand(Request request) {
+		if (Settings.getInstance().isActivated() && isCreationOrDropRequest(request)) {
+			setCurrentRequest(request);
+			getStateMachine().getLowEventManager().hoveringAClass(editPart);
+		}
+		return super.getCommand(request);
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/HoveringElementEditPolicy.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/HoveringElementEditPolicy.java
new file mode 100644
index 0000000..3c10f11
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/HoveringElementEditPolicy.java
@@ -0,0 +1,113 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies;
+
+import java.util.List;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool.CreateAspectUnspecifiedTypeRequest;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.StateMachine;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.StateMachineManager;
+
+/**
+ * This class is the super class of every edit policies present in this plug-in.
+ * It mainly defines:
+ * <UL>
+ * <LI>a constructor that requires an edit part</LI>
+ * <LI>a method to determine if a request to the previous edit part is a request
+ * to take into account (creation or drop ?)</LI>
+ * <LI>a method to get an access to the state machine to deal with (associated
+ * to the class diagram / root edit part</LI>
+ * <LI>a method to get an access to the request currently stored the state
+ * machine</LI>
+ * </UL>
+ * The main interest of edit policies for this plug-in is to intercept every
+ * interaction events on elements (that we are interested in, so class diagram
+ * ones). Within Papyrus, each interaction (even a simple move) is translated to
+ * a request (containing the corresponding meaning of the interaction), and this
+ * request in send to each edit policy - through its <B>getCommand method</B> -
+ * associated to the edit part (associated to the graphical element). If one
+ * edit policy returns a corresponding command, the interaction is "treated".
+ * <BR>
+ * The edit policies of the plug-in do not modify the answers of all existing
+ * policies: they are just here to intercept the "event" and make the
+ * collapse/expand animation if necessary. They are just here in order to notify
+ * the plug-in to act or not.
+ *
+ */
+public class HoveringElementEditPolicy extends DefaultCreationEditPolicy {
+
+	protected EditPart editPart;
+	String [] possibleToolLabels = { "class", "property", "operation"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * The constructor of the edit policies of the plug-in also needs an access to
+	 * their edit part...just in case.
+	 * 
+	 * @param editPart edit part which the edit policy is associated to
+	 */
+	public HoveringElementEditPolicy(EditPart editPart) {
+		super();
+		this.editPart = editPart;
+	}
+
+	/**
+	 * This method checks whether the incoming request is a request to take into
+	 * account or not.
+	 * 
+	 * @param request the incoming request
+	 * @return true if it is a creation or drop request
+	 */
+	protected boolean isCreationOrDropRequest(Request request) {
+		if (request instanceof CreateViewAndElementRequest) {
+			String activeToolLabel = editPart.getRoot().getViewer().getEditDomain().getPaletteViewer().getActiveTool().getLabel().toLowerCase();
+			for (String possibleToolLabel : possibleToolLabels) {
+				if (activeToolLabel.contains(possibleToolLabel)) {
+					return true;
+				}
+			}
+			return false;
+			
+		}
+		return request instanceof CreateAspectUnspecifiedTypeRequest 
+				|| request instanceof DropObjectsRequest;
+	}
+
+	/**
+	 * The method gives an access to the state machine associated to this class
+	 * diagram
+	 * 
+	 * @return state machine associated to this class diagram
+	 */
+	protected StateMachine getStateMachine() {
+		return StateMachineManager.getInstance().getStateMachine(editPart);
+	}
+
+	/**
+	 * The method gives an access to the request that is being processed by the
+	 * state machine
+	 * 
+	 * @param request current processed request (within the class diagram)
+	 */
+	protected void setCurrentRequest(Request request) {
+		getStateMachine().getLowEventManager().setCurrentRequest(request);
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/NotAClassEditPolicy.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/NotAClassEditPolicy.java
new file mode 100644
index 0000000..c6352e5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/NotAClassEditPolicy.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+
+/**
+ * This is an edit policy that inherits from
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy}
+ * and dedicated to process request / hovering events for any element of a class
+ * diagram except classes and their components.
+ */
+
+public class NotAClassEditPolicy extends HoveringElementEditPolicy {
+
+	/**
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy#PolicyToInheritFrom(EditPart)}
+	 * 
+	 * @param editPart edit part which the edit policy is associated to
+	 */
+	public NotAClassEditPolicy(EditPart editPart) {
+		super(editPart);
+	}
+
+	/**
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy}
+	 * for global explanation of edit policy and this method. Short summary:
+	 * intercept a move (during a creation/drop interaction) over the associated
+	 * graphical element
+	 * 
+	 * @param request the request corresponding to the interaction event
+	 */
+
+	@Override
+	public Command getCommand(Request request) {
+		if (Settings.getInstance().isActivated() && isCreationOrDropRequest(request)) {
+			setCurrentRequest(request);
+			getStateMachine().getLowEventManager().hoveringSomethingButAClass(editPart);
+		}
+		return super.getCommand(request);
+
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/NotHideableClassElementEditPolicy.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/NotHideableClassElementEditPolicy.java
new file mode 100644
index 0000000..9d86a5a
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/NotHideableClassElementEditPolicy.java
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+
+/**
+ * This is an edit policy that inherits from
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy}
+ * and dedicated to process request / hovering events for an uml class or any
+ * element that won't be collapsed or expanded.
+ * 
+ */
+
+public class NotHideableClassElementEditPolicy extends HoveringElementEditPolicy {
+
+	/**
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy#PolicyToInheritFrom(EditPart)}
+	 * 
+	 * @param editPart edit part which the edit policy is associated to
+	 */
+
+	public NotHideableClassElementEditPolicy(EditPart editPart) {
+		super(editPart);
+	}
+
+	/**
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HoveringElementEditPolicy}
+	 * for global explanation of edit policy and this method. Short summary:
+	 * intercept a move (during a creation/drop interaction) over the associated
+	 * graphical element
+	 * 
+	 * @param request the request corresponding to the interaction event
+	 */
+
+	@Override
+	public Command getCommand(Request request) {
+		if (Settings.getInstance().isActivated() && isCreationOrDropRequest(request)) {
+			setCurrentRequest(request);
+			getStateMachine().getLowEventManager().hoveringAClass(editPart);
+		}
+		return super.getCommand(request);
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/providers/MouseCreationEditPolicyProvider.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/providers/MouseCreationEditPolicyProvider.java
new file mode 100644
index 0000000..531ed08
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/providers/MouseCreationEditPolicyProvider.java
@@ -0,0 +1,279 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.providers;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.router.LinkLFDiagramRootEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractPackageableElementCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.adapters.notation.ContainerAdapter;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.EditPolicyFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+import org.eclipse.papyrus.uml.diagram.common.editparts.PackageEditPart;
+
+/**
+ *
+ * This class enables the "Auto Sizeable Classes" functionality to run. In other
+ * words, it's the starting point of the functionality. In the Papyrus
+ * libraries, there is no high-level events associated to drag-n-drop
+ * operations, like the one related to create a property in a class. However, we
+ * can use the edit policy mechanism for that: when the papyrus user clicks on
+ * the Property Button in the palette in order to add a property in a class,
+ * he/she moves the mouse pointer to the target class. During this global move,
+ * the mouse pointer hovers different elements which are present the diagram:
+ * classes, interfaces or packages and their components. As we are in a
+ * (property) "creation" process, each time the mouse moves (each pixel),
+ * Papyrus will ask to the edit part (that corresponds to hovered element) if
+ * the hovered element can create and include the future property. Actually, the
+ * edit part will ask to its edit policies if one of them can propose a command
+ * for this operation/request (property creation). <BR>
+ * <BR>
+ * The <B>ProviderToOverrideMouseMoveDuringCreation</B> class is used to install
+ * "our" edit policy (that will expand/collapse during the drag-n-drop). As this
+ * class has been indicated as implementing the extension point
+ * editPolicyProviders, it will be called when a new type of operation is asked
+ * on a editPart. The <B>provides</B> method will be invoked with the operation
+ * as parameter. If the operation is about creating something in a class
+ * diagram, we will install our edit policy in this editPart.
+ *
+ */
+public class MouseCreationEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	/**
+	 * This method has to be implemented by every edit policy provider. The method
+	 * has to answer whether it will propose or not an edit policy. If it is yes,
+	 * the createEditPolicies will be call the corresponding edit part
+	 *
+	 * @param operation
+	 *            refers to operation/request that is send to the edit part
+	 * @return true if the operation concern a creation and a uml class diagram
+	 */
+	@Override
+	public boolean provides(IOperation operation) {
+		if (isAnEditPolicyForCreationThatHasBeenAsked(operation) && Settings.getInstance().isActivated()) {
+			return doesTheEditPartInTheOperationConcernAClassDiagramElement(operation);
+		}
+
+		return false;
+
+	}
+
+	/**
+	 * This method is called if the method has returned true. So, an operation of
+	 * creation that concerns a element of a class diagram has been proposed for the
+	 * first time for this element. According to the type of element, the
+	 * corresponding edit policy (the behavior to adopt when hovered) will be
+	 * installed in the element (edit part)
+	 *
+	 * @param editPart
+	 *            the edit part that is concerned by the operation
+	 */
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		EditPolicy policy = null;
+
+		if (isAnEditPartForAnOperationInUmlClass(editPart)) {
+			policy = EditPolicyFactory.getInstance().createHideableClassElementEditPolicy(editPart.getParent());
+		}
+
+		else if (isAnEditPartForAnUmlClassComponentPotentiallyHideable(editPart)) {
+			policy = EditPolicyFactory.getInstance().createHideableClassElementEditPolicy(editPart);
+		}
+
+		else if (isAnEditPartForAnUmlClassComponentNotHideable(editPart)) {
+			policy = EditPolicyFactory.getInstance().createNotHideableClassElementEditPolicy(editPart);
+		}
+
+		else if (isAnEditPartForAUmlClassDiagram(editPart)) {
+			new ContainerAdapter(ModelEditPart.class.cast(editPart));
+			policy = EditPolicyFactory.getInstance().createContainerEditPolicy(editPart);
+		} else if (isAnEditPartForPackageContainer(editPart)) {
+			new ContainerAdapter(AbstractPackageableElementCompartmentEditPart.class.cast(editPart));
+			policy = EditPolicyFactory.getInstance().createContainerEditPolicy(editPart);
+		} else if (isAnEditPartInAnUmlClassDiagram(editPart)) {
+			policy = EditPolicyFactory.getInstance()
+					.createNotAClassEditPolicy(editPart);
+		}
+
+		if (policy != null) {
+			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, policy);
+		}
+
+	}
+
+	protected boolean isAnEditPartForPackageContainer(EditPart editPart) {
+		return editPart instanceof AbstractPackageableElementCompartmentEditPart;
+	}
+
+	/**
+	 * This method checks whether the operation concerns the creation of an
+	 * operation
+	 *
+	 * @param operation
+	 *            refers to operation/request that is send to the edit part
+	 * @return true if concerns an operation
+	 */
+
+	protected boolean isAnEditPolicyForCreationThatHasBeenAsked(IOperation operation) {
+		return operation instanceof CreateEditPoliciesOperation;
+	}
+
+	/**
+	 * This method checks if the edit part concerned by the operation/request is
+	 * related to an element of a uml class diagram
+	 *
+	 * @param operation
+	 *            As the method is invoked, when it's about a creation, this
+	 *            operation is a creation request.
+	 * @return yes or no the creation request concerns an element of a uml class
+	 *         diagram
+	 */
+	protected boolean doesTheEditPartInTheOperationConcernAClassDiagramElement(IOperation operation) {
+		final EditPart editPart = CreateEditPoliciesOperation.class.cast(operation).getEditPart();
+		return isAnEditPartInAnUmlClassDiagram(editPart);
+	}
+
+	/**
+	 * This method checks whether the edit part is related to an element in a class
+	 * diagram.
+	 *
+	 * @param editPart
+	 *            the editPart
+	 * @return yes or no the edit part concerns an element of a uml class diagram
+	 */
+	protected boolean isAnEditPartInAnUmlClassDiagram(EditPart editPart) {
+		if (isTheUselessEditPartRootElement(editPart)) {
+			return false;
+		}
+		if (isAnEditPartForAUmlClassDiagram(editPart)) {
+			return true;
+		}
+		return isAnEditPartInAnUmlClassDiagram(editPart.getParent());
+	}
+
+	/**
+	 * This methods checks if the editPart parameter is the root EditPart or it is
+	 * null.
+	 *
+	 * @param editPart
+	 *            the editPart
+	 * @return true if the edit part is the root one or null
+	 */
+	protected boolean isTheUselessEditPartRootElement(EditPart editPart) {
+		return (editPart == null || editPart instanceof LinkLFDiagramRootEditPart);
+	}
+
+	/**
+	 * This methods checks whether the editPart parameter corresponds to the class
+	 * diagram itself
+	 *
+	 * @param editPart
+	 *            the editPart
+	 * @return true if it is the class diagram editpart
+	 */
+	protected boolean isAnEditPartForAUmlClassDiagram(EditPart editPart) {
+		if (!(editPart instanceof DiagramEditPart)) {
+			return false;
+		}
+
+		DiagramEditPart modelEditPart = DiagramEditPart.class.cast(editPart);
+		if (!(modelEditPart.getModel() instanceof View)) {
+			return false;
+		}
+
+		View diagram = (View) modelEditPart.getModel();
+		return diagram.getType().equals(ModelEditPart.MODEL_ID);
+	}
+
+	/**
+	 * This methods checks whether the editPart parameter corresponds to a package
+	 *
+	 *
+	 * @param editPart
+	 *            the editPart
+	 * @return true if it is a package editpart
+	 */
+	protected boolean isAnEditPartForAPackage(EditPart editPart) {
+		return editPart instanceof PackageEditPart;
+	}
+
+	/**
+	 * This methods checks whether the editPart parameter corresponds to an
+	 * operation
+	 *
+	 * @param editPart
+	 *            the editPart
+	 * @return true if it is an editPart of an operation
+	 */
+	protected boolean isAnEditPartForAnOperationInUmlClass(EditPart editPart) {
+		return editPart instanceof OperationForClassEditPart;
+	}
+
+	/**
+	 * This methods checks whether the editPart parameter corresponds to an element
+	 * that is potentially hideable / collapsable
+	 *
+	 * @param editPart
+	 *            the editPart
+	 * @return true if it is an editPart of an attribute compartment, an operation
+	 *         compartment, an operation or a nested classes compartment
+	 */
+	protected boolean isAnEditPartForAnUmlClassComponentPotentiallyHideable(EditPart editPart) {
+		return (editPart instanceof ClassAttributeCompartmentEditPart
+				|| editPart instanceof ClassAttributeCompartmentEditPartCN
+				|| editPart instanceof ClassOperationCompartmentEditPart
+				|| editPart instanceof ClassOperationCompartmentEditPartCN
+				|| editPart instanceof OperationForClassEditPart
+				|| editPart instanceof ClassNestedClassifierCompartmentEditPart
+				|| editPart instanceof ClassNestedClassifierCompartmentEditPartCN);
+	}
+
+	/**
+	 * This methods checks whether the editPart parameter corresponds to an element
+	 * of a UML class but not something hideable / collapsable
+	 *
+	 * @param editPart
+	 *            the editPart
+	 * @return true if it is an editPart of the class itself (the top-level
+	 *         container) or elements associated to its name
+	 */
+	protected boolean isAnEditPartForAnUmlClassComponentNotHideable(EditPart editPart) {
+		return (editPart instanceof org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart
+				|| editPart instanceof ClassNameEditPart || editPart instanceof ClassNameEditPartCN
+				|| editPart instanceof ClassFloatingNameEditPart || editPart instanceof ClassFloatingNameEditPartCN);
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ClassExpanderCollapser.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ClassExpanderCollapser.java
new file mode 100644
index 0000000..4487e50
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ClassExpanderCollapser.java
@@ -0,0 +1,501 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+/**
+ *
+ * This class is the main one for the actual graphical mechanism of expanding
+ * and collapsing a class, that is to say, dynamically show and hide class
+ * compartments when hovering it during a creation operation. An instance is
+ * just a series of operations dedicated to show/hide compartments of a class.
+ * This is why constructors take classEditPart in parameter. The second possible
+ * parameter (concernedCompartment) is needed when the option "only concerned
+ * compartment" is active: when hovering a class with an property creation
+ * request will display only property compartment. <BR>
+ * <BR>
+ * <B>It is really important to know the following facts:</B>
+ * <UL>
+ * <LI>(from data level view point): A class contains properties, operations and
+ * nested classes in its ownElements property</LI>
+ * <LI>(from presentation level view point): A CSSShape contains properties,
+ * operations and nested classes as its children through different compartments
+ * (CSSBasicCompartment) whose type is specified through a String (ex:
+ * compartment.getType() gives "Class_AttributeCompartment")</LI>
+ * <LI>(from papyrus implementation level view point): A ClassEditPart contains
+ * properties, operations and nested classes as its children through different
+ * types of EditPart subclasses (like ClassAttributeCompartmentEditPart).</LI>
+ * </UL>
+ * A property in a class is not necessarily display in one of its graphical
+ * representation. So, to know if properties are display, we have to look for
+ * children in CSSBasicCompartment of the CCSShape and not ownedElements and
+ * Class. Finally, if a CSSBasicCompartment has its visible property set to
+ * false, the corresponding ClassAttributeCompartmentEditPart will be removed
+ * from its parent. This is really important to know.
+ *
+ */
+
+public class ClassExpanderCollapser {
+
+	private static final int SIZE_TO_ADD_WHEN_DISPLAY_A_COMPARTMENT = 20;
+
+	private Settings defaultSettings;
+
+	/**
+	 * This variable is for dealing with classes with
+	 */
+
+	private Map<BasicCompartment, Boolean> compartmentsVisibilityBeforeHoovering = null;
+
+	/**
+	 * Corresponds to the current class (notation level) that is hovered.
+	 */
+
+	private Shape umlClassShape;
+
+	/**
+	 * This variable is set according to the type of request.
+	 */
+	private int concernedCompartment;
+
+	/**
+	 * This variable is mainly useful to retrieve the bounds of the class when this
+	 * one is within a package (the bounds of the notation-level class is not directly usable).
+	 */
+	private ClassEditPart classEditPart = null;
+
+	/**
+	 * Constructing an instance generally implies a classEditPart because collapsing
+	 * and expanding are done on a class. This constructor implies that all
+	 * compartments will be expand / collapse (the option of showing only concerned
+	 * compartment is off) and the settings are general Eclipse ones.
+	 *
+	 * @param classEditPart
+	 *            the edit part of the class to expand/collapse
+	 */
+	public ClassExpanderCollapser(ClassEditPart classEditPart) {
+		this(classEditPart, ConcernedCompartment.NONE, Settings.getInstance());
+	}
+
+	/**
+	 * Constructing an instance generally implies a classEditPart because collapsing
+	 * and expanding are done on a class but if the option of showing only concerned
+	 * compartment is on, instantiation refers also to the concerned compartment.
+	 * This constructor implies that the settings are general Eclipse ones.
+	 *
+	 * @param classEditPart
+	 *            the edit part of the class to expand/collapse
+	 * @param concernedCompartment
+	 *            what compartment(s) to show/hide
+	 */
+	public ClassExpanderCollapser(ClassEditPart classEditPart, int concernedCompartment) {
+		this(classEditPart, concernedCompartment, Settings.getInstance());
+	}
+
+	/**
+	 * Constructing an instance generally implies a classEditPart because collapsing
+	 * and expanding are done on a class but if the option of showing only concerned
+	 * compartment is on, instantiation refers also to the concerned compartment
+	 *
+	 * @param classEditPart
+	 *            the edit part of the class to expand/collapse
+	 * @param concernedCompartment
+	 *            what compartment(s) to show/hide
+	 * @param defaultSettings
+	 *            the settings to use (like only concerned
+	 *            compartment options)
+	 */
+	public ClassExpanderCollapser(ClassEditPart classEditPart, int concernedCompartment, Settings defaultSettings) {
+		this(Shape.class.cast(classEditPart.getModel()), concernedCompartment, defaultSettings);
+		this.classEditPart = classEditPart;
+	}
+
+	/**
+	 * Constructing an instance generally implies a classEditPart because collapsing
+	 * and expanding are done on a class but if the option of showing only concerned
+	 * compartment is on, instantiation refers also to the concerned compartment
+	 *
+	 * @param classEditPart
+	 *            the edit part of the class to expand/collapse
+	 * @param concernedCompartment
+	 *            what compartment(s) to show/hide
+	 * @param defaultSettings
+	 *            the settings to use (like only concerned
+	 *            compartment options)
+	 */
+	public ClassExpanderCollapser(Shape umlClassShape, int concernedCompartment, Settings defaultSettings) {
+		super();
+		this.umlClassShape = umlClassShape;
+		this.setConcernedCompartment(concernedCompartment);
+		this.defaultSettings = defaultSettings;
+	}
+
+	//
+	// different facilities functions
+	//
+
+	public ClassExpanderCollapser(ClassEditPart currentClassEditPart, int concernedCompartment,
+			Map<BasicCompartment, Boolean> compartmentsVisibility) {
+		this(currentClassEditPart, concernedCompartment);
+		this.compartmentsVisibilityBeforeHoovering = compartmentsVisibility;
+	}
+
+	/**
+	 * Launch collapse operation if possible. Currently, there is no condition about
+	 * "if possible". Maybe in the future.
+	 */
+	public void collapseIfPossible() {
+		collapse();
+	}
+
+	/**
+	 * Launch expand operation if there are compartments that have been display by
+	 * this mechanisms
+	 *
+	 * @return true if the expand has been performed.
+	 */
+	public boolean expandIfPossible() {
+		if (isThereAConcernedCompartmentToDisplay()) {
+			expand();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * This method analyzes the compartments of the class at the notation level
+	 * (CSSBasicCompartmentImpl) to see is there is at least one compartment to
+	 * display.
+	 *
+	 * @return true if one compartment is concerned by the request and if it is
+	 *         empty (because if it isn't, it should be displayed).
+	 */
+	protected boolean isThereAConcernedCompartmentToDisplay() {
+		for (Object child : umlClassShape.getChildren()) {
+			if (child instanceof BasicCompartment) {
+				BasicCompartment compartment = BasicCompartment.class.cast(child);
+				if (isThisACompartmentToDisplay(compartment) && !isCompartmentVisible(compartment)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * This method indicates if all compartments have to be displayed. Generally,
+	 * it's the case when the only concerned compartment is off.
+	 *
+	 * @return true if all compartments have to be displayed.
+	 */
+	protected boolean areAllCompartmentsConcerned() {
+		return concernedCompartment == ConcernedCompartment.ALL || !defaultSettings.isOnlyConcernedCompartment();
+	}
+
+	/**
+	 * This method indicates - at the GEF level - if the compartment parameter is
+	 * empty or not.
+	 *
+	 * @param compartment
+	 *            (GEF-level)
+	 * @return true if there is at least one child
+	 */
+	protected boolean isCompartmentEmpty(CompartmentEditPart compartment) {
+		return compartment.getChildren().isEmpty();
+	}
+
+	/**
+	 * This method indicates - at the notation level - if the compartment parameter
+	 * is empty or not.
+	 *
+	 * @param compartment
+	 *            (notation-level)
+	 * @return true if there is at least one child
+	 */
+	protected boolean isCompartmentEmpty(BasicCompartment compartment) {
+		return compartment.getChildren().isEmpty();
+	}
+
+	/**
+	 * This method indicates - at the notation level - if the compartment parameter
+	 * is visible or not.
+	 *
+	 * @param compartment
+	 *            (notation-level)
+	 * @return true if there is at least one child
+	 */
+	protected boolean isCompartmentVisible(BasicCompartment compartment) {
+		return compartment.isVisible();
+	}
+
+	/**
+	 * Sets the visibility of the concerned compartments to true. See
+	 * {@link ClassExpanderCollapser#setCompartmentsVisibility(boolean)}
+	 */
+	private void expand() {
+		setCompartmentsVisibility(true);
+	}
+
+	/**
+	 * Sets the visibility of the concerned compartments to false. See
+	 * {@link ClassExpanderCollapser#setCompartmentsVisibility(boolean)}
+	 */
+	private void collapse() {
+		setCompartmentsVisibility(false);
+	}
+
+	/**
+	 * This method sets the visibility of a compartment at the notation-level. One
+	 * specificity is to add (or remove) a little height to the class in order give
+	 * or (give back) some space to the class with the new compartment.
+	 *
+	 * @param visibility
+	 *            true to display, false to hide.
+	 */
+	protected void setCompartmentsVisibility(final boolean visibility) {
+		List<BasicCompartment> compartmentList = getClassCompartments();
+
+		if (!compartmentList.isEmpty()) {
+			try {
+				TransactionalEditingDomain editingDomain = ServiceUtilsForEObject.getInstance()
+						.getTransactionalEditingDomain(umlClassShape);
+				executeWithoutCommandStack(editingDomain, new AbstractCommand() {
+
+					@Override
+					public void execute() {
+						setCompartmentsVisibilityImpl(visibility, compartmentList);
+					}
+
+					@Override
+					public void redo() {
+						// no redo will be performed as we do not use the command stack
+					}
+
+				});
+			} catch (ServiceException exception) {
+				Activator.getDefault().logError(exception.getMessage(), exception);
+			}
+		}
+	}
+
+	public static void executeWithoutCommandStack(TransactionalEditingDomain editingDomain, Command command) {
+		try {
+			GMFUnsafe.write(editingDomain, command);
+		} catch (InterruptedException exception) {
+			Activator.getDefault().logError(exception.getMessage(), exception);
+		} catch (RollbackException exception) {
+			Activator.getDefault().logError(exception.getMessage(), exception);
+		}
+	}
+
+	private boolean wasVisibleBeforeHoovering(BasicCompartment compartment) {
+		if (compartmentsVisibilityBeforeHoovering == null || compartmentsVisibilityBeforeHoovering.size() == 0) {
+			return false;
+		}
+		if (compartmentsVisibilityBeforeHoovering.containsKey(compartment)) {
+			return compartmentsVisibilityBeforeHoovering.get(compartment);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * This method indicates if the compartment parameter is concerned by the
+	 * request (concernedCompartment is set because of this last).
+	 *
+	 * @param compartment
+	 *            compartment to test
+	 * @return true if concerned by the request
+	 */
+	protected boolean isThisACompartmentToDisplay(BasicCompartment compartment) {
+		return ((!defaultSettings.isOnlyConcernedCompartment())
+				|| (getConcernedCompartment() == ConcernedCompartment.ALL)
+				|| (isThisAnAttributeCompartment(compartment)
+						&& concernedCompartment == ConcernedCompartment.PROPERTIES)
+				|| (isThisAnOperationCompartment(compartment)
+						&& concernedCompartment == ConcernedCompartment.OPERATIONS)
+				|| (isThisANestedClassifierCompartment(compartment)
+						&& concernedCompartment == ConcernedCompartment.NESTED_CLASSES));
+	}
+
+	protected boolean isThisAnAttributeCompartment(BasicCompartment compartment) {
+		return compartment.getType().equals(ClassAttributeCompartmentEditPart.VISUAL_ID)
+				|| compartment.getType().equals(ClassAttributeCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	protected boolean isThisAnOperationCompartment(BasicCompartment compartment) {
+		return compartment.getType().equals(ClassOperationCompartmentEditPart.VISUAL_ID)
+				|| compartment.getType().equals(ClassOperationCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	protected boolean isThisANestedClassifierCompartment(BasicCompartment compartment) {
+		return compartment.getType().equals(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)
+				|| compartment.getType().equals(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+	}
+
+	/**
+	 * This method returns the list of compartments (notation level) that we can
+	 * potentially expand or collapse.
+	 *
+	 * @return the list of potentially collapsable/expandable compartments.
+	 */
+	protected List<BasicCompartment> getClassCompartments() {
+		List<BasicCompartment> compartmentList = new ArrayList<>();
+		for (Object child : umlClassShape.getChildren()) {
+			if (isACompartmentToPotentiallyExpandCollapse(child)) {
+				compartmentList.add((BasicCompartment) child);
+			}
+		}
+		return compartmentList;
+	}
+
+	/**
+	 * This method adds a little height to the class when displaying a compartment
+	 * (this one is normally empty).
+	 *
+	 */
+	protected void addALittleHeightForACompartment() {
+		UmlClassResizer.getInstance().realResizeHeight(umlClassShape.getLayoutConstraint(),
+				classCurrentHeight() + SIZE_TO_ADD_WHEN_DISPLAY_A_COMPARTMENT);
+	}
+
+	/**
+	 * This method removes a little height to the class when hiding a compartment
+	 * (this one is normally empty).
+	 */
+	protected void removeALittleHeightForACompartment() {
+		UmlClassResizer.getInstance().realResizeHeight(umlClassShape.getLayoutConstraint(),
+				classCurrentHeight() - SIZE_TO_ADD_WHEN_DISPLAY_A_COMPARTMENT);
+	}
+
+	private int classCurrentHeight() {
+		int currentHeight = 0;
+		LayoutConstraint layoutConstraint = umlClassShape.getLayoutConstraint();
+		currentHeight = (java.lang.Integer) layoutConstraint.eGet(NotationPackage.eINSTANCE.getSize_Height());
+		if (currentHeight < 0 && classEditPart != null) {
+			currentHeight = classEditPart.getFigure().getBounds().height;
+		}
+		return currentHeight;
+	}
+
+	/**
+	 * This methods checks if the compartment is properties, operations or nested
+	 * classifies ones.
+	 *
+	 * @param child
+	 *            compartment to check.
+	 * @return true if one of previously listed.
+	 */
+	private boolean isACompartmentToPotentiallyExpandCollapse(Object child) {
+		if (child instanceof BasicCompartment) {
+			BasicCompartment compartment = BasicCompartment.class.cast(child);
+			if (isThisAnAttributeCompartment(compartment) || isThisAnOperationCompartment(compartment)
+					|| isThisANestedClassifierCompartment(compartment)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * This variable is set according to the type of request. See
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment}
+	 * for possible values.
+	 *
+	 * @return
+	 */
+	public int getConcernedCompartment() {
+		return concernedCompartment;
+	}
+
+	/**
+	 * To set the concerned compartment. See
+	 * {@link ClassExpanderCollapser#getConcernedCompartment()}
+	 *
+	 * @param concernedCompartment
+	 *            new compartment(s) concerned.
+	 */
+	protected void setConcernedCompartment(int concernedCompartment) {
+		this.concernedCompartment = concernedCompartment;
+	}
+
+	/**
+	 * This method return the hovered class at the notation level (CSSShapeImpl)
+	 */
+
+	protected Shape getCSSShape() {
+		return umlClassShape;
+	}
+
+	/**
+	 * This method return the hovered class at the data level (Classifier)
+	 */
+	protected org.eclipse.uml2.uml.Classifier getUmlClass() {
+		return org.eclipse.uml2.uml.Classifier.class.cast(umlClassShape.getElement());
+	}
+
+	/**
+	 * Access to the settings to use (like only concerned compartment options)
+	 *
+	 * @return the settings to use
+	 */
+	public Settings getDefaultSettings() {
+		return defaultSettings;
+	}
+
+	protected void setCompartmentsVisibilityImpl(final boolean visibility, List<BasicCompartment> compartmentList) {
+		for (BasicCompartment compartment : compartmentList) {
+			if (isThisACompartmentToDisplay(compartment) && ((visibility && !isCompartmentVisible(compartment))
+					|| (!visibility && isCompartmentEmpty(compartment) && isCompartmentVisible(compartment)
+							&& !wasVisibleBeforeHoovering(compartment)))) {
+				compartment.setVisible(visibility);
+				if (visibility) {
+					addALittleHeightForACompartment();
+				} else {
+					removeALittleHeightForACompartment();
+				}
+
+			}
+		}
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ClassExpanderCollapsertFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ClassExpanderCollapsertFactory.java
new file mode 100644
index 0000000..2a9d500
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ClassExpanderCollapsertFactory.java
@@ -0,0 +1,104 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils;
+
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+/**
+ * This class is used as a factory for classes in the editPolicies.utils
+ * package. It aims specially at creating instances of class Expanding Collapsing
+ * which is used by several other classes.
+ *
+ */
+public class ClassExpanderCollapsertFactory {
+
+	private static final  ClassExpanderCollapsertFactory INSTANCE = new ClassExpanderCollapsertFactory();
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 * 
+	 * @return instance/factory
+	 */
+	public static ClassExpanderCollapsertFactory getInstance() {
+		return INSTANCE;
+	}
+
+	private ClassExpanderCollapsertFactory() {
+
+	}
+
+	/**
+	 * The class ExpandingCollapsing needs 3 parameters to create an instance, see
+	 * {@link ClassExpanderCollapsertFactory#createExpandingCollapsing(ClassEditPart, int, Settings)}. Here
+	 * the value of concerned value of concerned compartments is ALL and for general
+	 * settings, it is the Eclipse settings.
+	 * 
+	 * @param classEditPart class(EditPart) to expand/collapse
+	 * @return the instance of ExpandingCollapsing set with the previous parameters
+	 */
+	public ClassExpanderCollapser createExpandingCollapsing(ClassEditPart classEditPart) {
+		return new ClassExpanderCollapser(classEditPart);
+	}
+
+	/**
+	 * The class ExpandingCollapsing needs 3 parameters to create an instance, see
+	 * {@link ClassExpanderCollapsertFactory#createExpandingCollapsing(ClassEditPart, int, Settings)}. Here
+	 * the value of general settings is the Eclipse settings.
+	 * 
+	 * @param classEditPart        class(EditPart) to expand/collapse
+	 * @param concernedCompartment the concerned compartments (all or a specific
+	 *                             one)
+	 * @return the instance of ExpandingCollapsing set with the previous parameters
+	 */
+	public ClassExpanderCollapser createExpandingCollapsing(ClassEditPart classEditPart, int concernedCompartment) {
+		return new ClassExpanderCollapser(classEditPart, concernedCompartment);
+	}
+
+	/**
+	 * The class ExpandingCollapsing needs 3 parameters to create an instance: the
+	 * class(EditPart) to expand/collapse, the concerned compartments (all or a
+	 * specific one), and the general settings/options
+	 * 
+	 * @param classEditPart        class(EditPart) to expand/collapse
+	 * @param concernedCompartment the concerned compartments (all or a specific
+	 *                             one)
+	 * @param defaultSettings      the general settings/options
+	 * @return the instance of ExpandingCollapsing set with the previous parameters
+	 */
+	public ClassExpanderCollapser createExpandingCollapsing(ClassEditPart classEditPart, int concernedCompartment,
+			Settings defaultSettings) {
+		return new ClassExpanderCollapser(classEditPart, concernedCompartment, defaultSettings);
+	}
+
+	/**
+	 * The class ExpandingCollapsing needs 3 parameters to create an instance: the
+	 * class(notation level) to expand/collapse, the concerned compartments (all or a
+	 * specific one), and the general settings/options
+	 * 
+	 * @param umlClassShape        class(notation level) to expand/collapse
+	 * @param concernedCompartment the concerned compartments (all or a specific
+	 *                             one)
+	 * @param defaultSettings      the general settings/options
+	 * @return the instance of ExpandingCollapsing set with the previous parameters
+	 */
+	public ClassExpanderCollapser createExpandingCollapsing(Shape umlClassShape, int concernedCompartment,
+			Settings defaultSettings) {
+		return new ClassExpanderCollapser(umlClassShape, concernedCompartment, defaultSettings);
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ConcernedCompartment.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ConcernedCompartment.java
new file mode 100644
index 0000000..0dd31d5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/ConcernedCompartment.java
@@ -0,0 +1,190 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils;
+
+import org.eclipse.gef.Request;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.ElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool.CreateAspectUnspecifiedTypeRequest;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * 
+ * This class is used for declaring constants related to what compartment to
+ * expand during a drag-n-drop. Some method use these constants to indicate, for
+ * example, what compartment is concerned by a creation request If the user want
+ * to add a property in a class, the previous mentioned method will return
+ * PROPERTIES. This class is also used to propose methods for extracting
+ * compartments that are concerned by requests.
+ * 
+ */
+
+public class ConcernedCompartment {
+
+	private static final ConcernedCompartment CHECKER= new ConcernedCompartment();
+
+	/**
+	 * This static method returns an instance of the class in order to access to
+	 * non-static methods dedicated to extract compartments that are concerned by
+	 * the request. For example, a request for a property creation will concern the
+	 * property compartment. Another reason for not implementing usual utils static
+	 * methods is that implementing static methods is not a good practice (and not
+	 * cool either for tests).
+	 * 
+	 * @return instance of the class to use non-static methods for extracting
+	 *         concerned compartments.
+	 */
+	public static ConcernedCompartment getChecker() {
+		return CHECKER;
+	}
+
+	/**
+	 * No compartment are concerned (may be used when the mechanism is not active
+	 */
+	public static final int NONE = 0;
+	/**
+	 * When only Properties class compartment is concerned (potentially adding a
+	 * property to a class)
+	 */
+	public static final int PROPERTIES = 1;
+	/**
+	 * When only Operation class compartment is concerned (potentially adding a
+	 * operation to a class)
+	 */
+	public static final int OPERATIONS = 2;
+	/**
+	 * When only Nested Classes compartment is concerned (potentially adding a
+	 * nested class to a class)
+	 */
+	public static final int NESTED_CLASSES = 3;
+	/**
+	 * When all class compartment are concerned (when the option of only concerned
+	 * compartment is off)
+	 */
+	public static final int ALL = 4;
+
+	/**
+	 * This method is call by
+	 * {@link ConcernedCompartment#getConcernedCompartment(Request)} and is
+	 * dedicated to CreateViewAndElementRequest
+	 * 
+	 * @param fullRequest request to analyze
+	 * @return the compartments concerned by the request.
+	 */
+	protected int getConcernedCompartmentInCreateViewRequest(CreateViewAndElementRequest fullRequest) {
+		String forWhat = fullRequest.getViewDescriptors().get(0).getSemanticHint();
+		if (forWhat.equals(PropertyForClassEditPart.VISUAL_ID)) {
+			return ConcernedCompartment.PROPERTIES;
+		}
+		if (forWhat.equals(OperationForClassEditPart.VISUAL_ID)) {
+			return ConcernedCompartment.OPERATIONS;
+		}
+		if (forWhat.equals(NestedClassForClassEditPart.VISUAL_ID)) {
+			return ConcernedCompartment.NESTED_CLASSES;
+		}
+		return ConcernedCompartment.NONE;
+	}
+
+	/**
+	 * This method is call by
+	 * {@link ConcernedCompartment#getConcernedCompartment(Request)} and is
+	 * dedicated to CreateAspectUnspecifiedTypeRequest
+	 * 
+	 * @param fullRequest request to analyze
+	 * @return the compartments concerned by the request.
+	 */
+	protected int getConcernedCompartmentInCreateAspectRequest(CreateAspectUnspecifiedTypeRequest fullRequest) {
+		for (Object rawElementType : fullRequest.getElementTypes()) {
+			if (rawElementType instanceof ElementType) {
+				ElementType element = (ElementType) rawElementType;
+				String displayName = element.getDisplayName();
+				if (displayName.startsWith("Property")) {
+					return ConcernedCompartment.PROPERTIES;
+				}
+				if (displayName.startsWith("Operation")) {
+					return ConcernedCompartment.OPERATIONS;
+				}
+				if (displayName.startsWith("Class")) {
+					return ConcernedCompartment.NESTED_CLASSES;
+				}
+			}
+		}
+		return ConcernedCompartment.NONE;
+	}
+
+	/**
+	 * This method is call by
+	 * {@link ConcernedCompartment#getConcernedCompartment(Request)} and is
+	 * dedicated to DropObjectsRequest
+	 * 
+	 * @param dropRequest request to analyze
+	 * @return the compartments concerned by the request.
+	 */
+	protected int getConcernedCompartmentInDropRequest(DropObjectsRequest dropRequest) {
+		for (Object object : dropRequest.getObjects()) {
+			if (object instanceof Property) {
+				return ConcernedCompartment.PROPERTIES;
+			}
+			if (object instanceof Operation) {
+				return ConcernedCompartment.OPERATIONS;
+			}
+			if (object instanceof org.eclipse.uml2.uml.Class) {
+				return ConcernedCompartment.NESTED_CLASSES;
+			}
+		}
+		return ConcernedCompartment.NONE;
+	}
+
+	/**
+	 * This method is called by the {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.LowEventManager} of the {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.StateMachine} when
+	 * there is a new request. The methods aims at extracting the compartments
+	 * concerned by one of the three types of supported requests :
+	 * <UL>
+	 * <LI>CreateViewAndElementRequest</LI>
+	 * <LI>CreateAspectUnspecifiedTypeRequest</LI>
+	 * <LI>DropObjectsRequest</LI>
+	 * </UL>
+	 * It will dispatch to the following methods according to the type of request : 
+	 * <UL>
+	 * <LI>{@link ConcernedCompartment#getConcernedCompartmentInCreateAspectRequest(CreateAspectUnspecifiedTypeRequest)}</LI>
+	 * <LI>{@link ConcernedCompartment#getConcernedCompartmentInCreateViewRequest(CreateViewAndElementRequest)}</LI>
+	 * <LI>{@link ConcernedCompartment#getConcernedCompartmentInDropRequest(DropObjectsRequest)}</LI>
+	 * </UL> 
+	 * @param request request to analyze
+	 * @return the compartments concerned by the request.
+	 */
+	public int getConcernedCompartment(Request request) {
+
+		if (request instanceof CreateViewAndElementRequest) {
+			CreateViewAndElementRequest fullRequest = CreateViewAndElementRequest.class.cast(request);
+			return getConcernedCompartmentInCreateViewRequest(fullRequest);
+		} else if (request instanceof CreateAspectUnspecifiedTypeRequest) {
+			CreateAspectUnspecifiedTypeRequest fullRequest = CreateAspectUnspecifiedTypeRequest.class.cast(request);
+			return getConcernedCompartmentInCreateAspectRequest(fullRequest);
+		} else if (request instanceof DropObjectsRequest) {
+			DropObjectsRequest dropRequest = DropObjectsRequest.class.cast(request);
+			return getConcernedCompartmentInDropRequest(dropRequest);
+		}
+		return ConcernedCompartment.NONE;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/UmlClassResizer.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/UmlClassResizer.java
new file mode 100644
index 0000000..7fc5120
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/edit/policies/utils/UmlClassResizer.java
@@ -0,0 +1,128 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+/**
+ * The class UmlClassResizer allows to propose a static-like method
+ * "resizeHeight" without using static methods. Mechanisms well fitted to unit
+ * tests. The class uses an instance to do this.
+ *
+ */
+public class UmlClassResizer {
+
+	private static final UmlClassResizer INSTANCE = new UmlClassResizer();
+
+	/**
+	 * @return
+	 */
+	public static UmlClassResizer getInstance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * See
+	 * {@link UmlClassResizer#resizeHeight(LayoutConstraint, TransactionalEditingDomain, int)}
+	 * for full description of meaning of resizeHeight. The method here replaces the
+	 * transactional editing domain by the global one and the layoutConstraint
+	 * parameter by the class (editPart - GEF level) including it.
+	 * 
+	 * @param umlClassEditPart the class (editPart - GEF level) that includes
+	 *                         indirectly the layoutConstraint
+	 * @param height           the new height of the class (notation level)
+	 * @throws ServiceException if the transaction cannot be done
+	 */
+	protected void resizeHeight(ClassEditPart umlClassEditPart, int height) throws ServiceException {
+		resizeHeight(Shape.class.cast(umlClassEditPart.getModel()), height);
+	}
+
+	/**
+	 * See
+	 * {@link UmlClassResizer#resizeHeight(LayoutConstraint, TransactionalEditingDomain, int)}
+	 * for full description of meaning of resizeHeight. The method here replaces the
+	 * transactional editing domain by the global one and the layoutConstraint
+	 * parameter by the class (notation level) including it.
+	 * 
+	 * @param umlClass the class (notation level) that includes the layoutConstraint
+	 * @param height   the new height of the class (notation level)
+	 * @throws ServiceException if the transaction cannot be done
+	 */
+	protected void resizeHeight(Shape umlClass, int height) throws ServiceException {
+		TransactionalEditingDomain editingDomain = ServiceUtilsForEObject.getInstance()
+				.getTransactionalEditingDomain(umlClass);
+		resizeHeight(umlClass.getLayoutConstraint(), editingDomain, height);
+	}
+
+	/**
+	 * See
+	 * {@link UmlClassResizer#resizeHeight(LayoutConstraint, TransactionalEditingDomain, int)}
+	 * for full description of meaning of resizeHeight. The method here replaces the
+	 * transactional editing domain by the global one.
+	 * 
+	 * @param layoutConstraint the layoutConstraint associated to the class
+	 * @param height           the new height of the class (notation level)
+	 * @throws ServiceException if the transaction cannot be done
+	 */
+	public void resizeHeight(LayoutConstraint layoutConstraint, int height) throws ServiceException {
+		TransactionalEditingDomain editingDomain = ServiceUtilsForEObject.getInstance()
+				.getTransactionalEditingDomain(layoutConstraint);
+		resizeHeight(layoutConstraint, editingDomain, height);
+	}
+
+	/**
+	 * Changing the height of a class is done by setting the height of the
+	 * layoutConstraint associated to the class (notation level). This setting
+	 * operation must be done through a transaction and so needs a
+	 * TransactionalEditingDomain. These are the 3 required parameters:
+	 * layoutConstraint, editingDomain and a height.
+	 * 
+	 * @param layoutConstraint the layoutConstraint associated to the class
+	 * @param editingDomain    the transactional editing Domain required to perform
+	 *                         a command
+	 * @param height           the new height of the class (notation level)
+	 * @throws ServiceException if the transaction cannot be done
+	 */
+	protected void resizeHeight(LayoutConstraint layoutConstraint, TransactionalEditingDomain editingDomain, int height)
+			throws ServiceException {
+		editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain, "Resize") {
+
+			@Override
+			protected void doExecute() {
+				realResizeHeight(layoutConstraint, height);
+			}
+		});
+	}
+
+	/**
+	 * This method is called by the transaction. It includes the real action to
+	 * performed. So it only needs layoutConstraint and the new height.
+	 * 
+	 * @param layoutConstraint the layoutConstraint associated to the class
+	 * @param height           the new height of the class (notation level)
+	 */
+	protected void realResizeHeight(LayoutConstraint layoutConstraint, int height) {
+		layoutConstraint.eSet(NotationPackage.eINSTANCE.getSize_Height(), height);
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/messages/Messages.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/messages/Messages.java
new file mode 100644
index 0000000..cbca5f8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/messages/Messages.java
@@ -0,0 +1,21 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.messages.messages"; //$NON-NLS-1$
+	public static String Activator_CannotBeCastedIn;
+	public static String Activator_InMethod;
+	public static String Activator_IsNullInMethod;
+	public static String Activator_Parameter;
+	public static String PreferencePage_CompartmentOption;
+	public static String PreferencePage_SizeOption;
+	public static String PreferencePage_UseOption;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/messages/messages.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/messages/messages.properties
new file mode 100644
index 0000000..bd16f54
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/messages/messages.properties
@@ -0,0 +1,7 @@
+Activator_CannotBeCastedIn=\ cannot be casted in 
+Activator_InMethod=\ in method 
+Activator_IsNullInMethod=\ is null in method 
+Activator_Parameter=Parameter 
+PreferencePage_CompartmentOption=Only collapse / expandable concerned compartment
+PreferencePage_SizeOption=Keep creation size
+PreferencePage_UseOption=Use collapsable/expandable classes
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/FakeSettings.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/FakeSettings.java
new file mode 100644
index 0000000..61110c9
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/FakeSettings.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference;
+
+public class FakeSettings extends Settings {
+
+	private boolean activated;
+	private boolean keepsCreationSize;
+	private boolean onlyConcernedCompartment;
+	
+	
+	public FakeSettings(boolean activated, boolean keepsCreationSize, boolean onlyConcernedCompartment) {
+		super();
+		this.activated = activated;
+		this.keepsCreationSize = keepsCreationSize;
+		this.onlyConcernedCompartment = onlyConcernedCompartment;
+	}
+
+	@Override
+	public boolean isActivated() {
+		return activated;
+	}
+
+	@Override
+	public void setActivated(boolean activated) {
+		this.activated=activated;
+	}
+
+	@Override
+	public boolean keepsCreationSize() {
+		return keepsCreationSize;
+	}
+
+	@Override
+	public void setKeepsCreationSize(boolean keepsCreationSize) {
+		this.keepsCreationSize=keepsCreationSize;
+	}
+
+	@Override
+	public boolean isOnlyConcernedCompartment() {
+		return onlyConcernedCompartment;
+	}
+
+	@Override
+	public void setOnlyConcernedCompartment(boolean onlyConcernedCompartment) {
+		this.onlyConcernedCompartment=onlyConcernedCompartment;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/Page.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/Page.java
new file mode 100644
index 0000000..ed17b46
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/Page.java
@@ -0,0 +1,176 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference;
+
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.messages.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * This class aims at displaying options for this plug-in in the preferences
+ * section of Eclipse/Papyrus.
+ *
+ */
+public class Page extends PreferencePage implements IWorkbenchPreferencePage {
+
+	public Page() {
+		// required
+	}
+
+	public Page(String title) {
+		super(title);
+		// required
+	}
+
+	public Page(String title, ImageDescriptor image) {
+		super(title, image);
+		// required
+	}
+
+	@Override
+	public void init(IWorkbench workbench) {
+		// required
+
+	}
+
+	/**
+	 * This method will create the graphical/form content for the three labels and checkboxes for the 3 options.
+	 */
+	@Override
+	protected Control createContents(Composite parent) {
+
+		Composite content = new Composite(parent, SWT.NONE);
+		content.setLayout(new GridLayout(2, false));
+		addActiveField(content);
+		addKeepCreationSizeField(content);
+		addOnlyConcernedCompartmentField(content);
+		return content;
+	}
+
+	/**
+	 * This method is called by createContents to display the label/checkbox for the active option.
+	 * @param content the parent component
+	 * @return return true if the option is on
+	 */
+	protected boolean addActiveField(Composite content) {
+		Label label = new Label(content, SWT.NONE);
+		label.setText(Messages.PreferencePage_UseOption);
+		Button check = new Button(content, SWT.CHECK);
+
+		boolean activated = Settings.getInstance().isActivated();
+		check.setSelection(activated);
+
+		check.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				boolean activated = check.getSelection();
+				Settings.getInstance().setActivated(activated);
+			}
+
+			@Override
+			public void mouseDown(MouseEvent e) {
+				// mouseDown reacts too late
+			}
+
+			@Override
+			public void mouseDoubleClick(MouseEvent e) {
+				// no reaction for double click
+			}
+		});
+		return activated;
+	}
+
+	/**
+	 * This method is called by createContents to display the label/checkbox for the keeping creation size option.
+	 * @param content the parent component
+	 * @return return true if the option is on
+	 */
+	protected boolean addKeepCreationSizeField(Composite content) {
+		Label label = new Label(content, SWT.NONE);
+		label.setText(Messages.PreferencePage_SizeOption);
+		Button check = new Button(content, SWT.CHECK);
+
+		boolean keepsCreationSize = Settings.getInstance().keepsCreationSize();
+		check.setSelection(keepsCreationSize);
+
+		check.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				boolean keepsCreationSize = check.getSelection();
+				Settings.getInstance().setKeepsCreationSize(keepsCreationSize);
+			}
+
+			@Override
+			public void mouseDown(MouseEvent e) {
+				// mouseDown reacts too late
+			}
+
+			@Override
+			public void mouseDoubleClick(MouseEvent e) {
+				// no reaction for double click
+			}
+		});
+		return keepsCreationSize;
+	}
+
+	/**
+	 * This method is called by createContents to display the label/checkbox for the only concerned compartment option.
+	 * @param content the parent component
+	 * @return return true if the option is on
+	 */
+	protected boolean addOnlyConcernedCompartmentField(Composite content) {
+		Label label = new Label(content, SWT.NONE);
+		label.setText(Messages.PreferencePage_CompartmentOption);
+		Button check = new Button(content, SWT.CHECK);
+
+		boolean onlyConcernedCompartment = Settings.getInstance().isOnlyConcernedCompartment();
+		check.setSelection(onlyConcernedCompartment);
+
+		check.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				boolean onlyConcernedCompartment = check.getSelection();
+				Settings.getInstance().setOnlyConcernedCompartment(onlyConcernedCompartment);
+			}
+
+			@Override
+			public void mouseDown(MouseEvent e) {
+				// mouseDown reacts too late
+			}
+
+			@Override
+			public void mouseDoubleClick(MouseEvent e) {
+				// no reaction for double click
+			}
+		});
+		return onlyConcernedCompartment;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/Settings.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/Settings.java
new file mode 100644
index 0000000..97dc7f5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/preference/Settings.java
@@ -0,0 +1,124 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.Activator;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * This class helps at accessing to eclipse configuration options related to
+ * this plug-in.
+ *
+ */
+public class Settings {
+
+	private static final String COMPARTMENT_FIELD = "onlyConcernedCompartment"; //$NON-NLS-1$
+
+	private static final String ACTIVATED_FIELD = "activated"; //$NON-NLS-1$
+
+	private static final String KEEP_SIZE_FIELD = "keepsCreationSize"; //$NON-NLS-1$
+
+	private static final Settings INSTANCE = new Settings();
+
+	/**
+	 * The instance (singleton) that allows to access to the configuration options.
+	 *
+	 * @return
+	 */
+	public static Settings getInstance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Option: is the plug-in is on ?
+	 *
+	 * @return true if it is on.
+	 */
+	public boolean isActivated() {
+		return InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID).getBoolean(ACTIVATED_FIELD, true);
+	}
+
+	/**
+	 * set the Option: is the plug-in is on ?
+	 *
+	 * @param activated
+	 *            true to activate the plug-in.
+	 */
+	public void setActivated(boolean activated) {
+		IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+		preferences.putBoolean(ACTIVATED_FIELD, activated);
+		try {
+			preferences.flush();
+		} catch (BackingStoreException exception) {
+			Activator.getDefault().logError(exception.getMessage(), exception);
+		}
+	}
+
+	/**
+	 * Option: keeps the size of a class given by the user when creating it
+	 *
+	 * @return true if the creation size will be kept.
+	 */
+	public boolean keepsCreationSize() {
+		return InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID).getBoolean(KEEP_SIZE_FIELD, true);
+	}
+
+	/**
+	 * set the Option: keeps the size of a class given by the user when creating it
+	 *
+	 * @param keepsCreationSize
+	 *            true to keep the creation size
+	 */
+	public void setKeepsCreationSize(boolean keepsCreationSize) {
+		IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+		preferences.putBoolean(KEEP_SIZE_FIELD, keepsCreationSize);
+		try {
+			preferences.flush();
+		} catch (BackingStoreException exception) {
+			Activator.getDefault().logError(exception.getMessage(), exception);
+		}
+	}
+
+	/**
+	 * Option: only collapse / expand the compartment concerned by the current
+	 * request.
+	 *
+	 * @return true if only concerned compartment will be collapsed / expanded
+	 */
+	public boolean isOnlyConcernedCompartment() {
+		return InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID).getBoolean(COMPARTMENT_FIELD, true);
+	}
+
+	/**
+	 * Option: only collapse / expand the compartment concerned by the current
+	 * request.
+	 *
+	 * @param onlyConcernedCompartment
+	 *            true if only concerned compartment will be collapsed / expanded
+	 */
+	public void setOnlyConcernedCompartment(boolean onlyConcernedCompartment) {
+		IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+		preferences.putBoolean(COMPARTMENT_FIELD, onlyConcernedCompartment);
+		try {
+			preferences.flush();
+		} catch (BackingStoreException exception) {
+			Activator.getDefault().logError(exception.getMessage(), exception);
+		}
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/EndOfRequestListener.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/EndOfRequestListener.java
new file mode 100644
index 0000000..22dc34b
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/EndOfRequestListener.java
@@ -0,0 +1,57 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;
+
+import org.eclipse.gef.palette.ToolEntry;
+import org.eclipse.gef.ui.palette.PaletteViewer;
+
+/**
+ * This class implements an listener to detect every change of actions on the
+ * class diagram, according the palette. It implements the
+ * org.eclipse.gef.palette.PaletteListener class. When the active tool changes,
+ * the listener notifies the state machine (passed in parameter).
+ *
+ */
+public class EndOfRequestListener implements org.eclipse.gef.palette.PaletteListener {
+
+	private StateMachine stateMachine;
+
+	/**
+	 * As when the active tool changes, the listener will notify a state machine,
+	 * this last one has to be passed in parameter of this constructor. (passed in
+	 * parameter).
+	 * 
+	 * @param stateMachine state machine to notified when there is a change of tool.
+	 */
+	public EndOfRequestListener(StateMachine stateMachine) {
+		super();
+		this.stateMachine = stateMachine;
+	}
+
+	private StateMachine getStateMachine() {
+		return stateMachine;
+	}
+
+	/**
+	 * When the active tool changes, the listener notifies the state machine (passed
+	 * in parameter of the constructor).
+	 */
+	@Override
+	public void activeToolChanged(PaletteViewer palette, ToolEntry tool) {
+		getStateMachine().getLowEventManager().activeToolChanged();
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/Event.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/Event.java
new file mode 100644
index 0000000..78ac1b1
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/Event.java
@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+
+/**
+ * This class is a data structure that contains different event-specific values.
+ * They are:
+ * <UL>
+ * <LI>the concerned edit part (graphical element)</LI>
+ * <LI>the request (type of interaction performed)</LI>
+ * <LI>the event code: the corresponding high-level event (see
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})</LI>
+ * </UL>
+ *
+ */
+public class Event {
+
+	private EditPart editPart;
+	private int eventCode;
+	private Request request;
+
+	/**
+	 * @param eventCode the event code: the corresponding high-level event (see
+	 *                  {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 * @param editPart  the concerned edit part (graphical element)
+	 * @param request   the request (type of interaction performed)
+	 */
+	public Event(int eventCode, EditPart editPart, Request request) {
+		super();
+		this.eventCode = eventCode;
+		this.editPart = editPart;
+		this.request = request;
+	}
+
+	/**
+	 * @param eventCode the event code: the corresponding high-level event (see
+	 *                  {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 * @param editPart  the concerned edit part (graphical element)
+	 */
+	public Event(int eventCode, EditPart editPart) {
+		this(eventCode, editPart, null);
+	}
+
+	/**
+	 * @param eventCode the event code: the corresponding high-level event (see
+	 *                  {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 * @param request   the request (type of interaction performed)
+	 */
+	public Event(int eventCode, Request request) {
+		this(eventCode, null, request);
+	}
+
+	/**
+	 * @param eventCode the event code: the corresponding high-level event (see
+	 *                  {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	public Event(int eventCode) {
+		this(eventCode, null, null);
+	}
+
+	/**
+	 * This method returns the included concerned edit part (graphical element)
+	 * 
+	 * @return edit part / graphical element
+	 */
+	public EditPart getEditPart() {
+		return editPart;
+	}
+
+	/**
+	 *
+	 * This method returns the included event code: the corresponding high-level
+	 * event
+	 * 
+	 * @return (see
+	 *         {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	public int getEventCode() {
+		return eventCode;
+	}
+
+	/**
+	 * @return
+	 */
+	public Request getRequest() {
+		return request;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/Events.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/Events.java
new file mode 100644
index 0000000..a3d29f7
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/Events.java
@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;
+
+/**
+ * This class only defines a set of event code used by the state machine (see
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.StateMachine}).
+ *
+ */
+public class Events {
+	/**
+	 * When the mouse starts to hover elements after the user click on the palette
+	 * to create a property, operation or a class.
+	 */
+	public static final int NEW_CREATE_REQUEST = 1;
+	/**
+	 * When the mouse starts to hover elements after the user drag and drop a
+	 * property, operation or a class from somewhere (like the model explorer)
+	 */
+	public static final int NEW_DROP_REQUEST = 2;
+	/**
+	 * When the mouse hovers a class or its components
+	 */
+	public static final int HOVERING_A_CLASS = 3;
+	/**
+	 * When the mouse hovers another class or its components just after hovering a
+	 * class
+	 */
+	public static final int HOVERING_ANOTHER_CLASS = 4;
+	/**
+	 * When the mouse hovers something except a class or its components
+	 */
+	public static final int HOVERING_SOMETHING_BUT_A_CLASS = 5;
+	/**
+	 * When the user clicks on the icon of the palette, or presses ESC or doing
+	 * something that stops the previous process.
+	 */
+	public static final int ACTIVE_TOOL_CHANGED = 6;
+	/**
+	 * When the user finishes their drag-n-drop.
+	 */
+	public static final int OBJECT_DROPPED = 7;
+	/**
+	 * When the request has been ended (processed or not).
+	 */
+	public static final int END_OF_REQUEST = 8;
+
+	/**
+	 * Labels are used for debugging concerns (put a name on a event code / integer value).
+	 */
+	public static final String labels[] = { "", "NEW_CREATE_REQUEST", "NEW_DROP_REQUES", "HOVERING_A_CLASS",
+			"HOVERING_ANOTHER_CLASS", "HOVERING_SOMETHING_BUT_A_CLASS", "ACTIVE_TOOL_CHANGED", "OBJECT_DROPPED",
+			"END_OF_REQUEST" };
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/LowEventManager.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/LowEventManager.java
new file mode 100644
index 0000000..e11f8eb
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/LowEventManager.java
@@ -0,0 +1,230 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool.CreateAspectUnspecifiedTypeRequest;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+/**
+ * This class transforms low-level events or operations into high-level events
+ * for the state machine. In fact, there is few differences between these two
+ * types of events. A LowEventManager will receive a stream of events (through
+ * its methods). For example, the mouse moves of one pixel over a class, its
+ * method hovering a class will be invoked. If the mouse moves of one other
+ * pixel over the same class,its method hovering a class will be invoked once
+ * again. The role of LowEventManager will be to fire high-level event the first
+ * time the mouse over a class... and for the other following hovered pixels of
+ * the class. <BR>
+ * That's the reason why this manager needs to store current request, concerned
+ * compartment and classEditPart to detect new type of interaction or new
+ * element involved in the current interaction.<BR>
+ * An instance of LowEventManager is always attached to a state machine: it
+ * always fires events on this machine as a transmission mean.
+ *
+ */
+public class LowEventManager {
+
+	private StateMachine stateMachine;
+	private ClassEditPart currentClassEditPart;
+	private Request currentRequest;
+	private int concernedCompartment;
+
+	/**
+	 * The constructor takes a state machine as a parameter (in order to fire
+	 * high-level events on it)
+	 * 
+	 * @param stateMachine the state machine
+	 */
+	public LowEventManager(StateMachine stateMachine) {
+		super();
+		this.stateMachine = stateMachine;
+	}
+
+	/**
+	 * @return the state machine associated to this low event manager.
+	 */
+	public StateMachine getStateMachine() {
+		return stateMachine;
+	}
+
+	/**
+	 * This method is used by edit policies to indicate that the mouse is hovering a
+	 * something except a class. If, previously, a class was hovered, then a
+	 * high-level event is fired (HOVERING_SOMETHING_BUT_A_CLASS) and there is no
+	 * more current hovered class.
+	 * 
+	 * @param editPart the editPart concerned by the hovering.
+	 */
+	public void hoveringSomethingButAClass(EditPart editPart) {
+		if (getCurrentClassEditPart() != null) {
+			setCurrentClassEditPart(null);
+			getStateMachine().fireEvent(StateMachineElementsFactory.getInstance().createEvent(Events.HOVERING_SOMETHING_BUT_A_CLASS));
+		}
+
+	}
+
+	/**
+	 * This method is used by edit policies to indicate that the mouse is hovering a
+	 * class or one of its components. If, previously, a class was hovered, then a
+	 * high-level event is fired (HOVERING_ANOTHER_CLASS) and the current hovered
+	 * class is now the one attached to the edit part parameter. If there wasn't
+	 * hovered class, another type of high-level event is fired (HOVERING_A_CLASS)
+	 * but with the same assignment for the current hovered class.
+	 * 
+	 * @param editPart the editPart concerned by the hovering.
+	 */
+	public void hoveringAClass(EditPart editPart) {
+		ClassEditPart hoveredClassEditPart = getCorrespondingClassEditPart(editPart);
+
+		if (getCurrentClassEditPart() == null) {
+			setCurrentClassEditPart(hoveredClassEditPart);
+			getStateMachine()
+					.fireEvent(StateMachineElementsFactory.getInstance().createEvent(Events.HOVERING_A_CLASS, hoveredClassEditPart));
+		}
+
+		if (getCurrentClassEditPart() != hoveredClassEditPart) {
+			setCurrentClassEditPart(hoveredClassEditPart);
+			getStateMachine()
+					.fireEvent(StateMachineElementsFactory.getInstance().createEvent(Events.HOVERING_ANOTHER_CLASS, hoveredClassEditPart));
+		}
+
+	}
+
+	/**
+	 * This method is used by edit policies to indicate that the current user-level
+	 * operation has changed. There is no more current hovered class. The high-level
+	 * event ACTIVE_TOOL_CHANGED will be fired.
+	 */
+	public void activeToolChanged() {
+		setCurrentClassEditPart(null);
+		getStateMachine().fireEvent(StateMachineElementsFactory.getInstance().createEvent(Events.ACTIVE_TOOL_CHANGED));
+	}
+
+	/**
+	 * This method is called when we are sure to deal with a class or one of its
+	 * components. The method return the class edit part that can be the edit part
+	 * passed as parameter or the class edit part that contains this parameter (for
+	 * compartments or other class components).
+	 * 
+	 * @param editPart the hovering edit par.
+	 * @return the corresponding class edit part
+	 */
+	private ClassEditPart getCorrespondingClassEditPart(EditPart editPart) {
+		while (!(editPart instanceof ClassEditPart)) {
+			editPart = editPart.getParent();
+		}
+		return (ClassEditPart) editPart;
+	}
+
+	/**
+	 * @return the current class edit part (if any)
+	 */
+	public ClassEditPart getCurrentClassEditPart() {
+		return currentClassEditPart;
+	}
+
+	/**
+	 * @param currentClassEditPart the new hovered class edit part.
+	 */
+	public void setCurrentClassEditPart(ClassEditPart currentClassEditPart) {
+		this.currentClassEditPart = currentClassEditPart;
+	}
+
+	/**
+	 * Requests are used to detect a new type of user-level action is active tool
+	 * listener didn't manage to detect it.
+	 * 
+	 * @return the current processed request.
+	 */
+	public Request getCurrentRequest() {
+		return currentRequest;
+	}
+
+	/**
+	 * This method aims at detecting - through the stream of requests - whether
+	 * there is a new user-level action. During a property creation d-n-d, hovering
+	 * a class produces a particular request but hovering next the class diagram
+	 * will produce another request (because the possible result is different). But it's still the same user-level action.
+	 * So this method analyzes the request in order to detect such thing.  
+	 * 
+	 * @param request the new current request (possibly a request of the same type). 
+	 */
+	public void setCurrentRequest(Request request) {
+		if (request == null) {
+			getStateMachine().fireEvent(StateMachineElementsFactory.getInstance().createEvent(Events.END_OF_REQUEST));
+			this.currentRequest = null;
+		} else if (currentRequest != null && (isCreationRequest(request) == isCreationRequest(currentRequest)
+				&& isDropObjectRequest(request) == isDropObjectRequest(currentRequest))) {
+			this.currentRequest = request;
+		} else {
+
+			if (currentRequest != null) {
+				getStateMachine().fireEvent(StateMachineElementsFactory.getInstance().createEvent(Events.END_OF_REQUEST));
+			}
+
+			if (isCreationRequest(request)) {
+				this.currentRequest = request;
+				setConcernedCompartment(ConcernedCompartment.getChecker().getConcernedCompartment(request));
+				getStateMachine().fireEvent(StateMachineElementsFactory.getInstance().createEvent(Events.NEW_CREATE_REQUEST));
+			}
+			if (isDropObjectRequest(request)) {
+				this.currentRequest = request;
+				setConcernedCompartment(ConcernedCompartment.getChecker().getConcernedCompartment(request));
+				getStateMachine().fireEvent(StateMachineElementsFactory.getInstance().createEvent(Events.NEW_DROP_REQUEST));
+			}
+		}
+	}
+
+	/**
+	 * @param request request 
+	 * @return true if it is a creation request or a creation request is in a "bundle" request. 
+	 */
+	protected boolean isCreationRequest(Request request) {
+		return request instanceof CreateAspectUnspecifiedTypeRequest || request instanceof CreateViewAndElementRequest;
+	}
+
+	/**
+	 * @param request request
+	 * @return true if it is a drop object request.
+	 */
+	protected boolean isDropObjectRequest(Request request) {
+		return request instanceof DropObjectsRequest;
+	}
+
+	/**
+	 * Returns the concerned compartment, always deduced from different elements (mainly the request). For more details, see {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment}.
+	 * @return the concerned compartment 
+	 */
+	protected int getConcernedCompartment() {
+		return concernedCompartment;
+	}
+
+	/**
+	 * Allows to set the current concerned compartment. For more details, see {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment}.
+	 * @param concernedCompartment the new concerned compartment.
+	 */
+	protected void setConcernedCompartment(int concernedCompartment) {
+		this.concernedCompartment = concernedCompartment;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachine.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachine.java
new file mode 100644
index 0000000..3ce75ee
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachine.java
@@ -0,0 +1,514 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.RootEditPart;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.papyrus.infra.gmfdiag.css.CSSShapeImpl;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ClassExpanderCollapser;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+/**
+ * This class is the heart of the interaction for the expand/collapse mechanism.
+ * As the name indicates it, the implementation of the interactions are done
+ * through a state machine. This state machine has a state that changes
+ * according the event the machine receives (through
+ * {@link StateMachine#fireEvent(Event)} method). <BR>
+ * To improve the code readability, the implementation of this method is
+ * distributed through different methods fireEvent_State_*: each one is
+ * responsible to treating any type of high-level events for a given state (see
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.States}).<BR>
+ * All these methods do generally the same thing: memorize the current hovered
+ * class, expand or collapse classes and add/remove listeners to some elements
+ * depending whether or not a new request begins.
+ * 
+ * The state machine is defined like this <BR>
+ * <img alt="state machine diagram" src=
+ * "https://www.cristal.univ-lille.fr/miny/papyrus/stateMachine.jpg">
+ * 
+ */
+public class StateMachine {
+
+	// To determine whether we are in the same diagram or not
+	private RootEditPart rootEditPart;
+
+	// To detect whether we hovering the same class or not
+	private ClassEditPart currentClassEditPart;
+
+	// To remember what compartments were visible before hovering (empty or not)
+	private Map<BasicCompartment, Boolean> compartmentsVisibilityBeforeHovering;
+
+	// Edit policies need to access to the lowEventManager of the state machine
+	// particularly to specify that the user is mouse-hovering an element
+	private LowEventManager lowEventManager;
+
+	// State of the state machine
+	private int state;
+
+	// Listener dedicated to the palette: when an palette action is over (ESC
+	// pressed or action performed), this listener will know it
+	private EndOfRequestListener endOfRequestListener;
+
+	/**
+	 * A state machine is associated to the edit part associated to the class
+	 * diagram (root edit part). This is the only one parameter of the constructor.
+	 * The constructor creates a low event manager and set the state at START.
+	 * 
+	 * @param rootEditPart root edit part of the class diagram.
+	 */
+	public StateMachine(RootEditPart rootEditPart) {
+		super();
+		this.rootEditPart = rootEditPart;
+		this.lowEventManager = StateMachineElementsFactory.getInstance().createLowEventManager(this);
+		setState(States.START);
+	}
+
+	/**
+	 * This method is used to received event from the low event manager. The events
+	 * are dispatched/distributed to methods fireEvent_State_*: each one is
+	 * responsible to treating any type of high-level events for a given state.
+	 * 
+	 * @param event the fired event
+	 */
+	public void fireEvent(Event event) {
+		switch (getState()) {
+		case States.START:
+			fireEvent_State_start(event);
+			break;
+		case States.WAITING_FROM_START:
+			fireEvent_State_waitingFromStart(event);
+			break;
+		case States.A_CLASS_IS_HOVERED:
+			fireEvent_State_aClassIsHovered(event);
+			break;
+		case States.ANOTHER_CLASS_IS_HOVERED:
+			fireEvent_State_anotherClassIsHovered(event);
+			break;
+		case States.NO_CLASS_IS_HOVERED:
+			fireEvent_State_noClassIsHovered(event);
+			break;
+		case States.CREATE_DROP_REQUEST_ENDED:
+			fireEvent_State_createDropRequestEnded(event);
+			break;
+		case States.END:
+			fireEvent_State_end(event);
+			break;
+		}
+	}
+
+	// **************************
+	//
+	// IMPLEMENTATION EVENTS
+	//
+	// **************************
+
+	// Events when state =
+	//
+	// START
+	//
+
+	/**
+	 * This method treats events when being in the state START
+	 * 
+	 * @param event event (see
+	 *              {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	protected void fireEvent_State_start(Event event) {
+		switch (event.getEventCode()) {
+		case Events.NEW_CREATE_REQUEST:
+		case Events.NEW_DROP_REQUEST:
+			listenEndOfRequest();
+			setState(States.WAITING_FROM_START);
+			break;
+		}
+	}
+
+	// Events when state =
+	//
+	// WAITING FROM THE START
+	//
+
+	/**
+	 * This method treats events when being in the state WAITING_FROM_START
+	 * 
+	 * @param event event (see
+	 *              {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	protected void fireEvent_State_waitingFromStart(Event event) {
+		switch (event.getEventCode()) {
+
+		case Events.HOVERING_A_CLASS:
+
+			ClassEditPart hoveredClass = getCorrespondingClassEditPart(event.getEditPart());
+
+			memorizeTheHoveredClass(hoveredClass);
+			expandClassIfPossible();
+
+			setState(States.A_CLASS_IS_HOVERED);
+
+			break;
+
+		case Events.HOVERING_SOMETHING_BUT_A_CLASS:
+			// Nothing to do
+			break;
+		case Events.ACTIVE_TOOL_CHANGED:
+			doNotListenEndOfRequest();
+			setState(States.END);
+			noMoreMemorizedRequest();
+			break;
+		}
+	}
+
+	// Events when state =
+	//
+	// A CLASS IS HOVERED
+	//
+
+	/**
+	 * This method treats events when being in the state A_CLASS_IS_HOVERED
+	 * 
+	 * @param event event (see
+	 *              {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	protected void fireEvent_State_aClassIsHovered(Event event) {
+		switch (event.getEventCode()) {
+
+		case Events.HOVERING_A_CLASS:
+			// It shouldn't normally happen
+			break;
+
+		case Events.HOVERING_ANOTHER_CLASS:
+
+			ClassEditPart hoveredClass = getCorrespondingClassEditPart(event.getEditPart());
+
+			collapseClassIfPossible();
+
+			memorizeTheHoveredClass(hoveredClass);
+
+			expandClassIfPossible();
+
+			setState(States.ANOTHER_CLASS_IS_HOVERED);
+
+			break;
+
+		case Events.HOVERING_SOMETHING_BUT_A_CLASS:
+
+			collapseClassIfPossible();
+
+			noMoreMemorizedClass();
+
+			setState(States.NO_CLASS_IS_HOVERED);
+
+			break;
+
+		case Events.ACTIVE_TOOL_CHANGED:
+
+			collapseClassIfPossible();
+
+			noMoreMemorizedClass();
+
+			doNotListenEndOfRequest();
+
+			setState(States.CREATE_DROP_REQUEST_ENDED);
+			setState(States.END);
+
+			noMoreMemorizedRequest();
+
+			break;
+		}
+	}
+
+	// Events when state =
+	//
+	// ANOTHER CLASS IS HOVERED
+	//
+
+	/**
+	 * This method treats events when being in the state ANOTHER_CLASS_IS_HOVERED
+	 * 
+	 * @param event event (see
+	 *              {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	protected void fireEvent_State_anotherClassIsHovered(Event event) {
+
+		// all possible events will perform the same operations
+		// as if we were in the AClassIsHovered state
+
+		fireEvent_State_aClassIsHovered(event);
+
+	}
+
+	// Events when state =
+	//
+	// NO CLASS IS HOVERED
+	//
+
+	/**
+	 * This method treats events when being in the state NO_CLASS_IS_HOVERED
+	 * 
+	 * @param event event (see
+	 *              {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	protected void fireEvent_State_noClassIsHovered(Event event) {
+
+		switch (event.getEventCode()) {
+
+		case Events.HOVERING_A_CLASS:
+
+			ClassEditPart hoveredClass = getCorrespondingClassEditPart(event.getEditPart());
+
+			memorizeTheHoveredClass(hoveredClass);
+			expandClassIfPossible();
+
+			setState(States.A_CLASS_IS_HOVERED);
+
+			break;
+
+		case Events.HOVERING_ANOTHER_CLASS:
+			// It shouldn't normally happen
+			break;
+
+		case Events.HOVERING_SOMETHING_BUT_A_CLASS:
+			// Nothing to do
+			break;
+
+		case Events.ACTIVE_TOOL_CHANGED:
+			doNotListenEndOfRequest();
+			setState(States.END);
+			noMoreMemorizedRequest();
+			break;
+		}
+
+	}
+
+	// Events when state =
+	//
+	// NO CLASS IS CREATE DROP REQUEST ENDED
+	//
+
+	/**
+	 * This method treats events when being in the state CREATE_DROP_REQUEST_ENDED
+	 * 
+	 * @param event event (see
+	 *              {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	protected void fireEvent_State_createDropRequestEnded(Event event) {
+		// normally, this states doesn't last
+	}
+
+	/**
+	 * This method treats events when being in the state END
+	 * 
+	 * @param event event (see
+	 *              {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 */
+	protected void fireEvent_State_end(Event event) {
+		switch (event.getEventCode()) {
+		case Events.NEW_CREATE_REQUEST:
+		case Events.NEW_DROP_REQUEST:
+			listenEndOfRequest();
+			setState(States.WAITING_FROM_START);
+			break;
+		}
+	}
+
+	// **************************
+	//
+	// OPERATIONS USED BY STATE MACHINE
+	//
+	// **************************
+
+	// listen palette in order to detect a change of tool
+	private void listenEndOfRequest() {
+		setEndOfRequestListener(StateMachineElementsFactory.getInstance().createEndOfRequestListener(this));
+		rootEditPart.getViewer().getEditDomain().getPaletteViewer().addPaletteListener(getEndOfRequestListener());
+	}
+
+	// do not listen palette (and so do not detect a change of tool anymore)
+	private void doNotListenEndOfRequest() {
+		rootEditPart.getViewer().getEditDomain().getPaletteViewer().removePaletteListener(getEndOfRequestListener());
+		setEndOfRequestListener(null);
+	}
+
+	// get the container / class edit part if the edit part parameter is not a class
+	// edit part (and so it would seem to be a component of a class)
+	private ClassEditPart getCorrespondingClassEditPart(EditPart editPart) {
+		while (!(editPart instanceof ClassEditPart)) {
+			editPart = editPart.getParent();
+		}
+		return (ClassEditPart) editPart;
+	}
+
+	// do not memorize a class anymore (not hovering a class)
+	private void noMoreMemorizedClass() {
+		setCurrentClassEditPart(null);
+		setCompartmentsVisibilityBeforeHoovering(null);
+	}
+
+	// get the memorized class
+	private ClassEditPart memorizedClass() {
+		return getCurrentClassEditPart();
+	}
+
+	// memorize the current hovered class.
+	private void memorizeTheHoveredClass(ClassEditPart hoveredClass) {
+		setCurrentClassEditPart(hoveredClass);
+		setCompartmentsVisibilityBeforeHoovering(getCompartmentsVisibility());
+	}
+
+	// collapse if there are compartments to hide
+	// use an instance of ExpandingCollapsing
+	private void collapseClassIfPossible() {
+		new ClassExpanderCollapser(getCurrentClassEditPart(), getLowEventManager().getConcernedCompartment(),
+				getCompartmentsVisibilityBeforeHoovering()).collapseIfPossible();
+	}
+
+	// expand if there are compartments to hide
+	// use an instance of ExpandingCollapsing
+	private void expandClassIfPossible() {
+		new ClassExpanderCollapser(getCurrentClassEditPart(), getLowEventManager().getConcernedCompartment(),
+				getCompartmentsVisibilityBeforeHoovering()).expandIfPossible();
+	}
+
+	private void noMoreMemorizedRequest() {
+		getLowEventManager().setCurrentRequest(null);
+	}
+
+	// get the notation-level class from the GEF-level one
+	private CSSShapeImpl getCorrespondingGraphicalClass(ClassEditPart classEditPart) {
+		return (CSSShapeImpl) classEditPart.getModel();
+	}
+
+	private Map<BasicCompartment, Boolean> getCompartmentsVisibility() {
+		Map<BasicCompartment, Boolean> compartmentList = new HashMap<BasicCompartment, Boolean>();
+		for (Object child : memorizedClass().getChildren()) {
+			if (child instanceof EditPart) {
+				EditPart editPart = EditPart.class.cast(child);
+				if (editPart.getModel() instanceof BasicCompartment) {
+					BasicCompartment compartment = BasicCompartment.class.cast(editPart.getModel());
+					if (compartment.getType().equals(ClassAttributeCompartmentEditPart.VISUAL_ID)
+							|| compartment.getType().equals(ClassAttributeCompartmentEditPartCN.VISUAL_ID)
+							|| compartment.getType().equals(ClassOperationCompartmentEditPart.VISUAL_ID)
+							|| compartment.getType().equals(ClassOperationCompartmentEditPartCN.VISUAL_ID)
+							|| compartment.getType().equals(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)
+							|| compartment.getType().equals(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)) {
+						compartmentList.put(compartment, compartment.isVisible());
+					}
+				}
+			}
+		}
+		return compartmentList;
+	}
+
+	// **************************
+	//
+	// GETTERS / SETTERS
+	//
+	// **************************
+
+	/**
+	 * @return current hovered class
+	 */
+	public ClassEditPart getCurrentClassEditPart() {
+		return currentClassEditPart;
+	}
+
+	/**
+	 * set the current hovered class
+	 * 
+	 * @param currentClassEditPart
+	 */
+	public void setCurrentClassEditPart(ClassEditPart currentClassEditPart) {
+		this.currentClassEditPart = currentClassEditPart;
+	}
+
+	/**
+	 * get the root edit part (which the state machine is associated to).
+	 * 
+	 * @return the root edit part
+	 */
+	public RootEditPart getRootEditPart() {
+		return rootEditPart;
+	}
+
+	/**
+	 * get the associated low event manager
+	 * 
+	 * @return associated low event manager
+	 */
+	public LowEventManager getLowEventManager() {
+		return lowEventManager;
+	}
+
+	/**
+	 * Get the current state. For more details, see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.States}
+	 * 
+	 * @return current state
+	 */
+	public int getState() {
+		return state;
+	}
+
+	/**
+	 * Set the current stage. For more details, see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.States}
+	 * 
+	 * @param state the new current state
+	 */
+	public void setState(int state) {
+		this.state = state;
+	}
+
+	/**
+	 * Get the listener of the palette (for detecting change of tool)
+	 * 
+	 * @return the listener
+	 */
+	public EndOfRequestListener getEndOfRequestListener() {
+		return endOfRequestListener;
+	}
+
+	/**
+	 * Set the listener of the palette (for detecting change of tool)
+	 * 
+	 * @param endOfRequestListener the listener
+	 */
+	public void setEndOfRequestListener(EndOfRequestListener endOfRequestListener) {
+		this.endOfRequestListener = endOfRequestListener;
+	}
+
+	public void setCompartmentsVisibilityBeforeHoovering(
+			Map<BasicCompartment, Boolean> compartmentsVisibilityBeforeHoovering) {
+		this.compartmentsVisibilityBeforeHovering = compartmentsVisibilityBeforeHoovering;
+	}
+
+	public Map<BasicCompartment, Boolean> getCompartmentsVisibilityBeforeHoovering() {
+		return compartmentsVisibilityBeforeHovering;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachineElementsFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachineElementsFactory.java
new file mode 100644
index 0000000..2660dbb
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachineElementsFactory.java
@@ -0,0 +1,121 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RootEditPart;
+
+
+/**
+ * This class is used as a factory for classes in the state_machine package. It
+ * aims at creating instances of classes LowEventManager, StateMachine, Event,
+ * AdapterThatListensOperationsOnClassCompartments and EndOfRequestListener.
+ */
+public class StateMachineElementsFactory {
+
+	private static final StateMachineElementsFactory INSTANCE = new StateMachineElementsFactory();
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 * 
+	 * @return instance/factory
+	 */
+	public static StateMachineElementsFactory getInstance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * @param stateMachine
+	 * @return
+	 */
+	public LowEventManager createLowEventManager(StateMachine stateMachine) {
+		return new LowEventManager(stateMachine);
+	}
+
+	/**
+	 * @param rootEditPart
+	 * @return
+	 */
+	public StateMachine createStateMachine(RootEditPart rootEditPart) {
+		return new StateMachine(rootEditPart);
+	}
+
+	/**
+	 * Create an event. For more details, see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Event}
+	 * 
+	 * @param eventCode the event code: the corresponding high-level event (see
+	 *                  {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 * @param editPart  the concerned edit part (graphical element)
+	 * @param request   the request (type of interaction performed)
+	 * @return the created event
+	 */
+	public Event createEvent(int eventCode, EditPart editPart, Request request) {
+		return new Event(eventCode, editPart, request);
+	}
+
+	/**
+	 * Create an event. For more details, see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Event}
+	 * 
+	 * @param eventCode the event code: the corresponding high-level event (see
+	 *                  {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 * @param editPart  the concerned edit part (graphical element)
+	 * @return the created event
+	 */
+	public Event createEvent(int eventCode, EditPart editPart) {
+		return new Event(eventCode, editPart);
+	}
+
+	/**
+	 * Create an event. For more details, see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Event}
+	 * 
+	 * @param eventCode the event code: the corresponding high-level event (see
+	 *                  {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 * @param request   the request (type of interaction performed)
+	 * @return the created event
+	 */
+	public Event createEvent(int eventCode, Request request) {
+		return new Event(eventCode, request);
+	}
+
+	/**
+	 * Create an event. For more details, see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Event}
+	 * 
+	 * @param eventCode the event code: the corresponding high-level event (see
+	 *                  {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.Events})
+	 * @return the created event
+	 */
+	public Event createEvent(int eventCode) {
+		return new Event(eventCode);
+	}
+
+	/**
+	 * Create an EndOfRequestListener. For more details,
+	 * see
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine.EndOfRequestListener}
+	 * 
+	 * @param stateMachine the state machine to notify.
+	 * @return the created listener.
+	 */
+	public EndOfRequestListener createEndOfRequestListener(StateMachine stateMachine) {
+		return new EndOfRequestListener(stateMachine);
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachineManager.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachineManager.java
new file mode 100644
index 0000000..5220806
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/StateMachineManager.java
@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.RootEditPart;
+
+/**
+ * This class defines a mechanism to store a state machine for each class
+ * diagram with an indexation based on the root edit part of the diagram. A
+ * HashMap is used for that.
+ */
+public class StateMachineManager {
+
+	static StateMachineManager INSTANCE = new StateMachineManager();
+	private Map<RootEditPart, StateMachine> stateMachines;
+
+	/**
+	 * Get access to the manager (singleton).
+	 * 
+	 * @return the state machine manager.
+	 */
+	public static StateMachineManager getInstance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * the basic constructor only creates the dedicated hashmap.
+	 */
+	public StateMachineManager() {
+		stateMachines = new HashMap<>();
+	}
+
+	/**
+	 * This method gets the state machine associated to the diagram where the edit
+	 * part (parameter) is.
+	 * 
+	 * @param editPart an edit part representing an element of a diagram.
+	 * @return the state machine associated to the diagram where the edit part
+	 *         (parameter) is.
+	 */
+	public StateMachine getStateMachine(EditPart editPart) {
+		return getStateMachine(editPart.getRoot());
+	}
+
+	/**
+	 * This method gets the state machine associated to the diagram represented by
+	 * the root edit part (parameter).
+	 * 
+	 * @param rootEditPart the edit part associated to a diagram
+	 * @return the state machine associated to the diagram represented by the root
+	 *         edit part.
+	 */
+	public StateMachine getStateMachine(RootEditPart rootEditPart) {
+		StateMachine stateMachine = stateMachines.get(rootEditPart);
+		if (stateMachine == null) {
+			stateMachine = new StateMachine(rootEditPart);
+			stateMachines.put(rootEditPart, stateMachine);
+		}
+		return stateMachine;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/States.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/States.java
new file mode 100644
index 0000000..f5cfe9c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/statemachine/States.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.statemachine;
+
+/**
+ * This class defines all the states that compose the state machine.
+ * The state machine is the following one:<BR>
+ * 
+ * <img alt="state machine diagram" src=
+ * "https://www.cristal.univ-lille.fr/miny/papyrus/stateMachine.jpg">
+ *
+ */
+public class States {
+	/**
+	 * start state
+	 */
+	public static final int START=0;
+	/**
+	 * waitingFromStart state
+	 */
+	public static final int WAITING_FROM_START=1;
+	/**
+	 * A class is hovered state
+	 */
+	public static final int A_CLASS_IS_HOVERED=2;
+	/**
+	 * Another class is hovered
+	 */
+	public static final int ANOTHER_CLASS_IS_HOVERED=3;
+	/**
+	 * No class is hovered state
+	 */
+	public static final int NO_CLASS_IS_HOVERED=4;
+	/**
+	 * Create / Drop request ended state
+	 */
+	public static final int CREATE_DROP_REQUEST_ENDED=5;
+	/**
+	 * Terminal start
+	 */
+	public static final int END=6;
+	
+	/**
+	 * Labels: used for debugging concerns
+	 */
+	public static final String labels[]= {
+			"START",
+			"WAITING_FROM_START",
+			"A_CLASS_IS_HOVERED",
+			"ANOTHER_CLASS_IS_HOVERED",
+			"NO_CLASS_IS_HOVERED",
+			"CREATE_DROP_REQUEST_ENDED",
+			"END"
+	};
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.classpath b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.classpath
new file mode 100755
index 0000000..acad1c2
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.project b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.project
new file mode 100644
index 0000000..68d36a8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.project
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc</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.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.core.resources.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.core.resources.prefs
new file mode 100755
index 0000000..896a9a5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.core.runtime.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.core.runtime.prefs
new file mode 100755
index 0000000..5a0ad22
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100755
index 0000000..04869d0
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,312 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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=260
+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_additive_operator=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_bitwise_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_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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_relational_operator=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_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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_relational_operator=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_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+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=260
+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=5
+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=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.jdt.ui.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100755
index 0000000..3f09e0f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+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\="true" 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 */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\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) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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 * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" 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}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${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>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.m2e.core.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100755
index 0000000..f897a7f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.pde.api.tools.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100755
index 0000000..b2260f8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Warning
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=Enabled
+changed_execution_env=Warning
+eclipse.preferences.version=1
+incompatible_api_component_version=Warning
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Error
+incompatible_api_component_version_report_minor_without_api_change=Error
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/META-INF/MANIFEST.MF b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..92872fd
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Papyrus Class Diagram Class Textual Edition Documentation (Incubation)
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Require-Bundle: org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.help;bundle-version="[3.8.0,4.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc
+Bundle-Vendor: Eclipse Modeling Project
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/about.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/about.html
new file mode 100644
index 0000000..ef2872f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/about.html
@@ -0,0 +1,28 @@
+<!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>November 30, 2017</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 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/build.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/build.properties
new file mode 100644
index 0000000..1ee3b2c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/build.properties
@@ -0,0 +1,6 @@
+bin.includes = META-INF/,\
+               about.html,\
+               plugin.xml,\
+               target/site/generated-eclipse-help/**
+src.includes = about.html,\
+				src/site/mediawiki/
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/plugin.xml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/plugin.xml
new file mode 100755
index 0000000..aa3cf5e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/plugin.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="target/generated-eclipse-help/devDoc-main-toc.xml"
+            primary="false">
+      </toc>
+      <toc
+            file="target/generated-eclipse-help/devDoc-toc.xml"
+            primary="false">
+      </toc>
+      <toc
+            file="target/generated-eclipse-help/userDoc-main-toc.xml"
+            primary="false">
+      </toc>
+      <toc
+            file="target/generated-eclipse-help/userDoc-toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/pom.xml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/pom.xml
new file mode 100644
index 0000000..c7bea70
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.plugins-doc</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
+				<configuration>
+					<sourceFolder>src/site/mediawiki</sourceFolder>
+					<outputFolder>${project.build.directory}/site/generated-eclipse-help</outputFolder>
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/site/generated-eclipse-help</helpPrefix>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/devDoc-main-toc.xml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/devDoc-main-toc.xml
new file mode 100755
index 0000000..4df9188
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/devDoc-main-toc.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Class Textual Edition" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocDev">
+  <topic label="Class Textual Edition">
+    <anchor id="ClassTextualEdition-DevDoc"/>
+    <link toc="target/generated-eclipse-help/devDoc-toc.xml"/>
+  </topic>
+</toc>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/devDoc.mediawiki b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/devDoc.mediawiki
new file mode 100644
index 0000000..13d218f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/devDoc.mediawiki
@@ -0,0 +1,41 @@
+= Overview =
+The code for this feature is provided by the plugin '''org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition'''.
+
+The following schema shows an overview of the implementation of the textual editor. 
+[[File:images/implementationOverview.png|frame|none|Overview of the implementation]]
+
+As you can see, there are three entry points.
+
+The first two ones concern the launch of the editor and the associated mapping Java to Javascript. 
+
+The third one concerns the conversion of the editor's content into papyrus.
+
+= Launching the editor =
+
+A command has been added to launch the editor. The command has been associated to the SHIFT+ENTER shorcut.
+This command is implemented by the class '''handlers.ClassEditionHandler'''. 
+The '''execute''' method of this class will instantiate the Class '''UmlClassHTMLEditionDialog''' with the consequences to execute boitsth methods '''constructBrowserInDialog''' and '''loadHtmlPage'''. The first method creates the dialog window with an instance of a JavaFX Web Browser (WebView). The second one load all the necessary files for the web editor (inside the WebView).
+
+= Editor launched: mapping Java to Javascript =
+
+When all the javascript is loaded two methods of the Java Objects javascript.functions.ObjectWithFunctions will be called from the web editor: '''getAccessibleTypes''' and '''getProperties'''.
+
+'''getAccessibleTypes''' gets all types that will be supported by the editor (and proposed during autocomplete) for properties, operations and parameters. This methods fetch all possible types and returns a list of String. For this operation, '''mapping.TypeHelper''' and '''mapping.AccessibleTypes''' will be used.
+ 
+'''getProperties''' will use the class '''mapping.java2js.JsonUmlClassFromEditPart''' to construct a JSON structure equivalent to the selected UML Class. '''mapping.java2js.JsonUmlPropertyFromEditPart''' and '''mapping.java2js.JsonUmlOperationFromEditPart''' Java classes will also be used.
+
+= Editor closed : mapping Javascript to Java =
+
+When the web editor closes, it invokes the method '''expandIfNecessary''' of the class '''classcompartments.ClassExpander'''. This refers to accordion feature (display compartments of a UML class only if they contain something). It will look in the JSON specification of the class to see if there are properties or operations in order to display the corresponding compartment if this one is collapsed.
+
+Next, the '''JsonUmlClassToEditPart''' class is used to map the JSON specification of the class to the the Papyrus context. In other words, translating what was described in the editor to the UML class diagram context. 
+
+= The rest of the documentation =
+
+This page gives an overview of how the editor works. For the details, please refer to the Javadoc where each class are completely described. 
+
+
+
+
+
+
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/autocomplete.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/autocomplete.png
new file mode 100644
index 0000000..b51b64e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/autocomplete.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/implementationOverview.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/implementationOverview.png
new file mode 100644
index 0000000..4bad9c3
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/implementationOverview.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/operationParameterPattern.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/operationParameterPattern.png
new file mode 100644
index 0000000..60a3eb7
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/operationParameterPattern.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/overview.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/overview.png
new file mode 100644
index 0000000..5059441
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/overview.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/propertyModifiers.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/propertyModifiers.png
new file mode 100644
index 0000000..b074027
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/propertyModifiers.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/propertyPattern.png b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/propertyPattern.png
new file mode 100644
index 0000000..df5701c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/images/propertyPattern.png
Binary files differ
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/userDoc-main-toc.xml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/userDoc-main-toc.xml
new file mode 100755
index 0000000..0925ab5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/userDoc-main-toc.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Class Textual Edition" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTipsAndTricks">
+  <topic label="Class Textual Edition">
+    <anchor id="ClassTextualEdition-userDoc"/>
+    <link toc="target/generated-eclipse-help/userDoc-toc.xml"/>
+  </topic>
+</toc>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/userDoc.mediawiki b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/userDoc.mediawiki
new file mode 100644
index 0000000..e87a9de
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.doc/src/site/mediawiki/userDoc.mediawiki
@@ -0,0 +1,73 @@
+= Textual Editor for UML Class =
+You need to install the Papyrus  '''Papyrus Look And Feel''' to use this function.
+
+== Overview ==
+
+The textual editor for UML classes allows you to add, modify or remove visible properties and operations of a class displayed in a diagram. As shown in the following figure on the Librarian class example, a large number of characteristics of properties, operations and parameters of the class Librarian can be edited: their name, visibility, type, multiplicity and the characteristics of the value set for multi-valued elements. 
+
+[[File:images/overview.png|frame|none|Textual edition of the class Librarian]]
+
+== How it works ==
+
+The class editor is triggered or opened by simultaneously pressing the Shift and Enter keys after selecting a (single) class. 
+A frame with the editor in it appears to the right of the class.
+You can then write new properties or operations (or modify/delete old ones), and to validate this new definition of your class, you just have to press Shift and Enter again at the same time. If you do not want to validate anything and cancel the edition, just press ESC.
+
+== Autocomplete ==
+
+At any time, you can press simultaneously Ctrl and Enter to have propositions (autocomplete). Of course, proposition for the name of property or operation won't be useful but for types or modifiers, it will be.
+
+[[File:images/autocomplete.png|frame|none|Autocomplete for the type of a property]]
+
+== What can you edit? ==
+
+=== The "names" === 
+It is important to know that for class names, properties, operations or parameters you can use quotation marks in order to have names containing spaces, as you can see with the "return a free" method in the Librarian example.
+
+=== The class name ===
+The first (non-empty) line should start with the keyword class followed by the name of your class.
+It must not have anything else.
+
+=== The properties ===
+
+[[File:images/propertyPattern.png|frame|none|Pattern for the property definition]]
+
+A property must at least have a '''name'''. In other words, a line with only one "word" will correspond to a property with this "word" as its name.
+
+You can indicate its '''visibility''' by prefixing the name with +, -, # or ~ (for public, private, package or protected respectively).
+
+Just after the visibility character, you can also indicate if it is a '''derived''' property with the / character.
+
+For the other definition elements, put a ''':''' after the property name. 
+
+The '''type of the property''' is defined after the :. You have at your disposal the basic types defined in the imported package named '''primitive types''': boolean, string, integer and real. Are added the classes, data types and enumerations defined in your model.
+
+The last definition elements are the '''modifiers''' and are indicated between { }.
+The available modifiers are :
+* readOnly: is this a read-only property?
+* id: is it an identification property?
+* Union: is it a union derived from subsets?
+* Ordered | unordered: is the list of possible values ordered?
+* Unique | nonunique: is each value in the list of possible values unique?
+* Seq or sequence: the list of possible values is ordered and the values are unique
+
+The following figure shows the autocomplete for property modifiers.
+
+[[File:images/propertyModifiers.png|frame|none|Autocomplete for the modifiers of a property]]
+
+=== The operations ===
+
+[[File:images/operationParameterPattern.png|frame|none|Pattern for the definition of an operation and its parameter]]
+
+A line becomes the definition of an operation if there are ( and ). 
+
+For example "op" is the definition of the property ''''op''''. "Op ( )" is the definition of the operation ''''op'''' which has no parameter.
+
+Like a property, you can indicate its '''visibility''' by prefixing the name with +, -, # or ~ (for public, private, package or protected respectively).
+
+For the definition of the '''returnValue''', as indicated on the Pattern figure, you can specify its type, its multiplicity and some modifiers mainly related to the case of a list of returned values. For the meaning of possible modifiers, see the property definition.
+
+For each '''parameter''' (separated by a coma), you can specify its name, its type, its multiplicity and, like for the returnValue, modifiers for list of values.
+You can also indicate the '''direction''' of a parameter: in, out, inout. The default value is ''in'' which is the classic direction (i.e by value). ''Out'' means "by reference".
+
+The only mandatory element in the parameter definition is its name.  
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.classpath b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.classpath
new file mode 100644
index 0000000..eca7bdb
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.project b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.project
new file mode 100644
index 0000000..f8c18a1
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.core.resources.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..896a9a5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.core.runtime.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..49ce3e3
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,317 @@
+eclipse.preferences.version=1
+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.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+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.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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=260
+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_additive_operator=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_bitwise_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_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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_relational_operator=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_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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_relational_operator=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_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+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=260
+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=5
+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=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.jdt.ui.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..ba7542e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+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\="true" 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 */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\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) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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 * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" 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}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${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=true
+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=true
+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=false
+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=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+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=true
+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=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+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=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_type_arguments=true
+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=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+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=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.pde.api.tools.prefs b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..b2260f8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Warning
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=Enabled
+changed_execution_env=Warning
+eclipse.preferences.version=1
+incompatible_api_component_version=Warning
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Error
+incompatible_api_component_version_report_minor_without_api_change=Error
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/CQs.txt b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/CQs.txt
new file mode 100755
index 0000000..38b5b6a
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/CQs.txt
@@ -0,0 +1,6 @@
+CQs for this plugin are:
+jackson-core https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21855 
+jackson-annotation : https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21856
+jackson-databinding : https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21857
+mockito : https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21858
+codemirror : https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22234
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/How_To_Compile b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/How_To_Compile
new file mode 100755
index 0000000..2a74c85
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/How_To_Compile
@@ -0,0 +1,21 @@
+English version:
+	TO BE DONE
+
+French version:
+L'intégration de JavaFX dans Eclipse/OSGi (Et en particulier le FXCanvas) est compliquée, et change d'une version à l'autre de Java (7/8/11+).
+Le mieux, c'est d'intégrer la dernière version d'E(fx)clipse (org.eclipse.fx.*, en particulier le "Minimal OSGi Runtime" bundles), et de voir si ça règle tes soucis.
+Normalement, il n'y a pas besoin d'aller toucher aux Jars de JavaFX
+
+https://www.eclipse.org/efxclipse/index.html
+
+L'update site pour l'IDE (Pour développer en JavaFX dans Eclipse) : http://download.eclipse.org/efxclipse/updates-released/3.6.0/site/
+L'update site pour le runtime (A ajouter à la target platform) : https://download.eclipse.org/efxclipse/runtime-released/3.6.2/site
+
+Il y a juste besoin d'ajouter ces paramètres dans les VM Args de ma launch config pour le runtime/debug, côté développeur :
+
+-Dosgi.framework.extensions=org.eclipse.fx.osgi 
+-Dorg.osgi.framework.bundle.parent=ext
+
+- Dans l'Eclipse de dev, installer la feature E(fx)clipse IDE, pour la partie "compilation" dans l'IDE
+- Ajouter la feature "OSGi Minimal runtime" (org.eclipse.fx.runtime.min.feature[.feature.group]) de E(fx)clipse dans la target platform (C'est cette feature qui se charge de rendre les packages de la VM visibles, et de jongler entre les différentes versions de la VM Java, pour faire en sorte que ce soit transparent entre Java 7/8/9/11+)
+- Ajouter les arguments indiqués plus haut dans les VMArgs de ta launch config (Si je ne dis pas de bêtises, l'un des deux est nécessaire pour JavaFX, et l'autre pour JavaFX-SWT)
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/META-INF/MANIFEST.MF b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..79ec318
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Papyrus Class Diagram Class Textual Edition (Incubation)
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="3.101.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="4.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="2.3.0",
+ org.eclipse.papyrus.editor;bundle-version="2.0.0",
+ org.eclipse.papyrus.uml.diagram.clazz,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="3.3.200",
+ org.mockito;bundle-version="2.23.0",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.9.9",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="2.9.9",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="2.9.93",
+ org.eclipse.papyrus.infra.architecture;bundle-version="2.0.0",
+ org.eclipse.papyrus.uml.architecture;bundle-version="1.1.200"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Vendor: Eclipse Modeling Project
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/about.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/about.html
new file mode 100644
index 0000000..ef2872f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/about.html
@@ -0,0 +1,28 @@
+<!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>November 30, 2017</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 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</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/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/build.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/build.properties
new file mode 100644
index 0000000..454ee0a
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               html/,\
+               about.html
+jars.compile.order = .
+src.includes = about.html
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.di b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.di
new file mode 100644
index 0000000..8c549ee
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.notation b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.notation
new file mode 100644
index 0000000..4d4fda9
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.notation
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmi:id="_tE-d4ILwEeqmhMG6ogYQKA" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <styles xsi:type="notation:StringValueStyle" xmi:id="_tE-d4YLwEeqmhMG6ogYQKA" name="diagram_compatibility_version" stringValue="1.4.0"/>
+  <styles xsi:type="notation:DiagramStyle" xmi:id="_tE-d4oLwEeqmhMG6ogYQKA"/>
+  <styles xsi:type="style:PapyrusDiagramStyle" xmi:id="_tE-d44LwEeqmhMG6ogYQKA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner href="doc.uml#_tA7EUILwEeqmhMG6ogYQKA"/>
+  </styles>
+  <element href="doc.uml#_tA7EUILwEeqmhMG6ogYQKA"/>
+</notation:Diagram>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.uml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.uml
new file mode 100644
index 0000000..b60b062
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/doc.uml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_tA7EUILwEeqmhMG6ogYQKA" name="doc">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_tITesILwEeqmhMG6ogYQKA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+</uml:Model>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/overview.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/overview.html
new file mode 100644
index 0000000..470dc27
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/doc/overview.html
@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/html">
+    <body> 
+<div class="header">
+<H2>Goal</H2>
+This textual editor has been developed in order to add more quickly properties and operations in a class (event rename it).<BR>
+When your class is selected, just press SHIFT+ENTER to start edition, and SHIFT+ENTER again to validate it.<BR>
+<IMG width="500px" alt="Example of screen with the textual editor" SRC="screenshot.jpg">
+<H2>Implementation</H2>
+All the java classes are javadoc-ed. To understand the implementation, the best is to start reading the javadoc of the {@link org.eclipse.papyrus.uml.diagram.clazz.edition.textual.clazz.edit.policies.providers.ProviderToAddKeyboardShortcuts} class.
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/readme.txt b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/readme.txt
new file mode 100644
index 0000000..65e57bb
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/readme.txt
@@ -0,0 +1,20 @@
+The lib directory contains all library files related to CodeMirror 5.50.0 
+I didn't write any line of these files and they are under MIT license (for javascript files).
+The lib/scripts directory concerns javascript files of CodeMirror and autoComplete facility (show-hint)
+The lib/styles directory refers to equivalent topics (CodeMirror / AutoComplete) but with CSS styles. Docs.css is another imported style (a useful example found on the net).
+For the files that I wrote for the uml class textual editor, they are located on 3 places:
+- scripts directory for javascript files
+- styles directory for CSS styles
+- root one for html file.
+
+Index.html is not used by the plug-in. It is just useful for debuging the whole JS stuff within a classic browser.
+  
+The files from the lib folder comes from the zip downloaded here: https://codemirror.net/codemirror-5.50.0.zip
+/!\ the zip is not the same than on github https://github.com/codemirror/CodeMirror/archive/5.50.0.zip 
+(this last one doesn't contains the file codemirror.js which is built and included in the zip available on codemirror.net).
+
+Origin of the files copied in Payrus:
+	codemirror.js and codemirror.css -> in the zip, /lib folder
+	show-hint.js and show-hint.css -> in the zip, /addon/hint folder
+	doc.css -> in the zip, /doc folder
+	
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/body.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/body.html
new file mode 100644
index 0000000..9f087c9
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/body.html
@@ -0,0 +1,50 @@
+<style>.CodeMirror {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+}</style>
+<style>
+    .line-error {
+        /*background: #FBC2C4 !important;
+        color: #8a1f11 !important;*/
+        border-bottom: 2px red solid;
+    }
+
+</style>
+<body>
+<textarea id="code" name="code">
+class "It seems that there was a problem"
+"Try to reload..."
+</textarea>
+<script>
+
+    window.onload = function () {
+        CodeMirror.commands.autocomplete = function (cm) {
+            cm.showHint({hint: CodeMirror.hint.umlClass});
+        }
+        CodeMirror.commands.out = function (cm) {
+            closeAndPerform(Mapping.ToPapyrus.returnClassSpecificationToPapyrus());
+        }
+        window.editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+            lineNumbers: false,
+            lineWrapping: true,
+            gutters: [Errors.gutterLabel],
+            extraKeys: {
+                "Ctrl-Space": "autocomplete",
+                "Shift-Enter": "out"
+            },
+        });
+
+        Mapping.setAccessibleTypes(JSON.parse(getAccessibleTypes()));
+
+
+        editor.getGutterElement().style.width = "15px";
+        editor.display.sizer.style.marginLeft = "15px";
+        Mapping.FromPapyrus.setEditorValueWithClassSpecification();
+        Errors.startObserving();
+        editor.focus();
+        editor.setCursor(editor.lineCount(), 0);
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/head.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/head.html
new file mode 100644
index 0000000..519c9bb
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/head.html
@@ -0,0 +1,4 @@
+<!doctype html>
+
+<title>CodeMirror: Properties files mode</title>
+<meta charset="utf-8"/>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/index.html b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/index.html
new file mode 100644
index 0000000..cafe17c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/index.html
@@ -0,0 +1,67 @@
+<!doctype html>
+
+<title>CodeMirror: Properties files mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="lib/styles/docs.css">
+<link rel="stylesheet" href="lib/styles/codemirror.css">
+<link rel="stylesheet" href="lib/styles/show-hint.css">
+<script src="lib/scripts/codemirror.js"></script>
+<script src="lib/scripts/show-hint.js"></script>
+<script src="scripts/utils.js"></script>
+<script src="scripts/logFunction.js"></script>
+<script src="scripts/readingTokens.js"></script>
+<script src="scripts/statesTypesAndLabels.js"></script>
+<script src="scripts/autoComplete.js"></script>
+<script src="scripts/errorManagment.js"></script>
+<script src="scripts/editorStateMachine.js"></script>
+<script src="scripts/propertyManagment.js"></script>
+<style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
+<style>
+    .line-error {
+        /*background: #FBC2C4 !important;
+        color: #8a1f11 !important;*/
+        border-bottom: 2px red solid;
+    }
+
+</style>
+<body>
+<textarea id="code" name="code">
+class Try
++/nom : String [0..1] {unique , seq }
+/age : int
+zeOper ( in p1 : Integer [0..1] {ordered , unique },out p2 : String, in p3 : Boolean {ordered}) : String {unique}
+</textarea>
+    <script>
+
+        CodeMirror.commands.autocomplete = function(cm) {
+            cm.showHint({hint: CodeMirror.hint.umlClass});
+        }
+        CodeMirror.commands.out = function(cm) {
+            console.log("TEST");
+        }
+      window.editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+          lineNumbers: false,
+          lineWrapping: true,
+          gutters: [Errors.gutterLabel],
+          extraKeys: {
+              "Ctrl-Space": "autocomplete",
+              "Shift-Enter":"out"
+          },
+      });
+
+        editor.getGutterElement().style.width="15px";
+        editor.display.sizer.style.marginLeft="15px";
+        function getProperties () {
+            return "{\n" +
+                "  \"name\" : \"Class2\",\n" +
+                "  \"properties\" : [ ],\n" +
+                "  \"operations\" : [ ]\n" +
+                "}";
+        };
+		Mapping.FromPapyrus.setEditorValueWithClassSpecification();
+        Errors.startObserving();
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/scripts/codemirror.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/scripts/codemirror.js
new file mode 100755
index 0000000..22ac022
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/scripts/codemirror.js
@@ -0,0 +1,9785 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+// This is CodeMirror (https://codemirror.net), a code editor
+// implemented in JavaScript on top of the browser's DOM.
+//
+// You can find some technical background for some of the code below
+// at http://marijnhaverbeke.nl/blog/#cm-internals .
+
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global.CodeMirror = factory());
+}(this, (function () { 'use strict';
+
+  // Kludges for bugs and behavior differences that can't be feature
+  // detected are enabled based on userAgent etc sniffing.
+  var userAgent = navigator.userAgent;
+  var platform = navigator.platform;
+
+  var gecko = /gecko\/\d/i.test(userAgent);
+  var ie_upto10 = /MSIE \d/.test(userAgent);
+  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
+  var edge = /Edge\/(\d+)/.exec(userAgent);
+  var ie = ie_upto10 || ie_11up || edge;
+  var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1]);
+  var webkit = !edge && /WebKit\//.test(userAgent);
+  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
+  var chrome = !edge && /Chrome\//.test(userAgent);
+  var presto = /Opera\//.test(userAgent);
+  var safari = /Apple Computer/.test(navigator.vendor);
+  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
+  var phantom = /PhantomJS/.test(userAgent);
+
+  var ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
+  var android = /Android/.test(userAgent);
+  // This is woefully incomplete. Suggestions for alternative methods welcome.
+  var mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
+  var mac = ios || /Mac/.test(platform);
+  var chromeOS = /\bCrOS\b/.test(userAgent);
+  var windows = /win/i.test(platform);
+
+  var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
+  if (presto_version) { presto_version = Number(presto_version[1]); }
+  if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
+  // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
+  var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
+  var captureRightClick = gecko || (ie && ie_version >= 9);
+
+  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
+
+  var rmClass = function(node, cls) {
+    var current = node.className;
+    var match = classTest(cls).exec(current);
+    if (match) {
+      var after = current.slice(match.index + match[0].length);
+      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+    }
+  };
+
+  function removeChildren(e) {
+    for (var count = e.childNodes.length; count > 0; --count)
+      { e.removeChild(e.firstChild); }
+    return e
+  }
+
+  function removeChildrenAndAdd(parent, e) {
+    return removeChildren(parent).appendChild(e)
+  }
+
+  function elt(tag, content, className, style) {
+    var e = document.createElement(tag);
+    if (className) { e.className = className; }
+    if (style) { e.style.cssText = style; }
+    if (typeof content == "string") { e.appendChild(document.createTextNode(content)); }
+    else if (content) { for (var i = 0; i < content.length; ++i) { e.appendChild(content[i]); } }
+    return e
+  }
+  // wrapper for elt, which removes the elt from the accessibility tree
+  function eltP(tag, content, className, style) {
+    var e = elt(tag, content, className, style);
+    e.setAttribute("role", "presentation");
+    return e
+  }
+
+  var range;
+  if (document.createRange) { range = function(node, start, end, endNode) {
+    var r = document.createRange();
+    r.setEnd(endNode || node, end);
+    r.setStart(node, start);
+    return r
+  }; }
+  else { range = function(node, start, end) {
+    var r = document.body.createTextRange();
+    try { r.moveToElementText(node.parentNode); }
+    catch(e) { return r }
+    r.collapse(true);
+    r.moveEnd("character", end);
+    r.moveStart("character", start);
+    return r
+  }; }
+
+  function contains(parent, child) {
+    if (child.nodeType == 3) // Android browser always returns false when child is a textnode
+      { child = child.parentNode; }
+    if (parent.contains)
+      { return parent.contains(child) }
+    do {
+      if (child.nodeType == 11) { child = child.host; }
+      if (child == parent) { return true }
+    } while (child = child.parentNode)
+  }
+
+  function activeElt() {
+    // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.
+    // IE < 10 will throw when accessed while the page is loading or in an iframe.
+    // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.
+    var activeElement;
+    try {
+      activeElement = document.activeElement;
+    } catch(e) {
+      activeElement = document.body || null;
+    }
+    while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement)
+      { activeElement = activeElement.shadowRoot.activeElement; }
+    return activeElement
+  }
+
+  function addClass(node, cls) {
+    var current = node.className;
+    if (!classTest(cls).test(current)) { node.className += (current ? " " : "") + cls; }
+  }
+  function joinClasses(a, b) {
+    var as = a.split(" ");
+    for (var i = 0; i < as.length; i++)
+      { if (as[i] && !classTest(as[i]).test(b)) { b += " " + as[i]; } }
+    return b
+  }
+
+  var selectInput = function(node) { node.select(); };
+  if (ios) // Mobile Safari apparently has a bug where select() is broken.
+    { selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; }; }
+  else if (ie) // Suppress mysterious IE10 errors
+    { selectInput = function(node) { try { node.select(); } catch(_e) {} }; }
+
+  function bind(f) {
+    var args = Array.prototype.slice.call(arguments, 1);
+    return function(){return f.apply(null, args)}
+  }
+
+  function copyObj(obj, target, overwrite) {
+    if (!target) { target = {}; }
+    for (var prop in obj)
+      { if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
+        { target[prop] = obj[prop]; } }
+    return target
+  }
+
+  // Counts the column offset in a string, taking tabs into account.
+  // Used mostly to find indentation.
+  function countColumn(string, end, tabSize, startIndex, startValue) {
+    if (end == null) {
+      end = string.search(/[^\s\u00a0]/);
+      if (end == -1) { end = string.length; }
+    }
+    for (var i = startIndex || 0, n = startValue || 0;;) {
+      var nextTab = string.indexOf("\t", i);
+      if (nextTab < 0 || nextTab >= end)
+        { return n + (end - i) }
+      n += nextTab - i;
+      n += tabSize - (n % tabSize);
+      i = nextTab + 1;
+    }
+  }
+
+  var Delayed = function() {
+    this.id = null;
+    this.f = null;
+    this.time = 0;
+    this.handler = bind(this.onTimeout, this);
+  };
+  Delayed.prototype.onTimeout = function (self) {
+    self.id = 0;
+    if (self.time <= +new Date) {
+      self.f();
+    } else {
+      setTimeout(self.handler, self.time - +new Date);
+    }
+  };
+  Delayed.prototype.set = function (ms, f) {
+    this.f = f;
+    var time = +new Date + ms;
+    if (!this.id || time < this.time) {
+      clearTimeout(this.id);
+      this.id = setTimeout(this.handler, ms);
+      this.time = time;
+    }
+  };
+
+  function indexOf(array, elt) {
+    for (var i = 0; i < array.length; ++i)
+      { if (array[i] == elt) { return i } }
+    return -1
+  }
+
+  // Number of pixels added to scroller and sizer to hide scrollbar
+  var scrollerGap = 30;
+
+  // Returned or thrown by various protocols to signal 'I'm not
+  // handling this'.
+  var Pass = {toString: function(){return "CodeMirror.Pass"}};
+
+  // Reused option objects for setSelection & friends
+  var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
+
+  // The inverse of countColumn -- find the offset that corresponds to
+  // a particular column.
+  function findColumn(string, goal, tabSize) {
+    for (var pos = 0, col = 0;;) {
+      var nextTab = string.indexOf("\t", pos);
+      if (nextTab == -1) { nextTab = string.length; }
+      var skipped = nextTab - pos;
+      if (nextTab == string.length || col + skipped >= goal)
+        { return pos + Math.min(skipped, goal - col) }
+      col += nextTab - pos;
+      col += tabSize - (col % tabSize);
+      pos = nextTab + 1;
+      if (col >= goal) { return pos }
+    }
+  }
+
+  var spaceStrs = [""];
+  function spaceStr(n) {
+    while (spaceStrs.length <= n)
+      { spaceStrs.push(lst(spaceStrs) + " "); }
+    return spaceStrs[n]
+  }
+
+  function lst(arr) { return arr[arr.length-1] }
+
+  function map(array, f) {
+    var out = [];
+    for (var i = 0; i < array.length; i++) { out[i] = f(array[i], i); }
+    return out
+  }
+
+  function insertSorted(array, value, score) {
+    var pos = 0, priority = score(value);
+    while (pos < array.length && score(array[pos]) <= priority) { pos++; }
+    array.splice(pos, 0, value);
+  }
+
+  function nothing() {}
+
+  function createObj(base, props) {
+    var inst;
+    if (Object.create) {
+      inst = Object.create(base);
+    } else {
+      nothing.prototype = base;
+      inst = new nothing();
+    }
+    if (props) { copyObj(props, inst); }
+    return inst
+  }
+
+  var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+  function isWordCharBasic(ch) {
+    return /\w/.test(ch) || ch > "\x80" &&
+      (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch))
+  }
+  function isWordChar(ch, helper) {
+    if (!helper) { return isWordCharBasic(ch) }
+    if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) { return true }
+    return helper.test(ch)
+  }
+
+  function isEmpty(obj) {
+    for (var n in obj) { if (obj.hasOwnProperty(n) && obj[n]) { return false } }
+    return true
+  }
+
+  // Extending unicode characters. A series of a non-extending char +
+  // any number of extending chars is treated as a single unit as far
+  // as editing and measuring is concerned. This is not fully correct,
+  // since some scripts/fonts/browsers also treat other configurations
+  // of code points as a group.
+  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
+  function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
+
+  // Returns a number from the range [`0`; `str.length`] unless `pos` is outside that range.
+  function skipExtendingChars(str, pos, dir) {
+    while ((dir < 0 ? pos > 0 : pos < str.length) && isExtendingChar(str.charAt(pos))) { pos += dir; }
+    return pos
+  }
+
+  // Returns the value from the range [`from`; `to`] that satisfies
+  // `pred` and is closest to `from`. Assumes that at least `to`
+  // satisfies `pred`. Supports `from` being greater than `to`.
+  function findFirst(pred, from, to) {
+    // At any point we are certain `to` satisfies `pred`, don't know
+    // whether `from` does.
+    var dir = from > to ? -1 : 1;
+    for (;;) {
+      if (from == to) { return from }
+      var midF = (from + to) / 2, mid = dir < 0 ? Math.ceil(midF) : Math.floor(midF);
+      if (mid == from) { return pred(mid) ? from : to }
+      if (pred(mid)) { to = mid; }
+      else { from = mid + dir; }
+    }
+  }
+
+  // BIDI HELPERS
+
+  function iterateBidiSections(order, from, to, f) {
+    if (!order) { return f(from, to, "ltr", 0) }
+    var found = false;
+    for (var i = 0; i < order.length; ++i) {
+      var part = order[i];
+      if (part.from < to && part.to > from || from == to && part.to == from) {
+        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i);
+        found = true;
+      }
+    }
+    if (!found) { f(from, to, "ltr"); }
+  }
+
+  var bidiOther = null;
+  function getBidiPartAt(order, ch, sticky) {
+    var found;
+    bidiOther = null;
+    for (var i = 0; i < order.length; ++i) {
+      var cur = order[i];
+      if (cur.from < ch && cur.to > ch) { return i }
+      if (cur.to == ch) {
+        if (cur.from != cur.to && sticky == "before") { found = i; }
+        else { bidiOther = i; }
+      }
+      if (cur.from == ch) {
+        if (cur.from != cur.to && sticky != "before") { found = i; }
+        else { bidiOther = i; }
+      }
+    }
+    return found != null ? found : bidiOther
+  }
+
+  // Bidirectional ordering algorithm
+  // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
+  // that this (partially) implements.
+
+  // One-char codes used for character types:
+  // L (L):   Left-to-Right
+  // R (R):   Right-to-Left
+  // r (AL):  Right-to-Left Arabic
+  // 1 (EN):  European Number
+  // + (ES):  European Number Separator
+  // % (ET):  European Number Terminator
+  // n (AN):  Arabic Number
+  // , (CS):  Common Number Separator
+  // m (NSM): Non-Spacing Mark
+  // b (BN):  Boundary Neutral
+  // s (B):   Paragraph Separator
+  // t (S):   Segment Separator
+  // w (WS):  Whitespace
+  // N (ON):  Other Neutrals
+
+  // Returns null if characters are ordered as they appear
+  // (left-to-right), or an array of sections ({from, to, level}
+  // objects) in the order in which they occur visually.
+  var bidiOrdering = (function() {
+    // Character types for codepoints 0 to 0xff
+    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
+    // Character types for codepoints 0x600 to 0x6f9
+    var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";
+    function charType(code) {
+      if (code <= 0xf7) { return lowTypes.charAt(code) }
+      else if (0x590 <= code && code <= 0x5f4) { return "R" }
+      else if (0x600 <= code && code <= 0x6f9) { return arabicTypes.charAt(code - 0x600) }
+      else if (0x6ee <= code && code <= 0x8ac) { return "r" }
+      else if (0x2000 <= code && code <= 0x200b) { return "w" }
+      else if (code == 0x200c) { return "b" }
+      else { return "L" }
+    }
+
+    var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
+    var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
+
+    function BidiSpan(level, from, to) {
+      this.level = level;
+      this.from = from; this.to = to;
+    }
+
+    return function(str, direction) {
+      var outerType = direction == "ltr" ? "L" : "R";
+
+      if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) { return false }
+      var len = str.length, types = [];
+      for (var i = 0; i < len; ++i)
+        { types.push(charType(str.charCodeAt(i))); }
+
+      // W1. Examine each non-spacing mark (NSM) in the level run, and
+      // change the type of the NSM to the type of the previous
+      // character. If the NSM is at the start of the level run, it will
+      // get the type of sor.
+      for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) {
+        var type = types[i$1];
+        if (type == "m") { types[i$1] = prev; }
+        else { prev = type; }
+      }
+
+      // W2. Search backwards from each instance of a European number
+      // until the first strong type (R, L, AL, or sor) is found. If an
+      // AL is found, change the type of the European number to Arabic
+      // number.
+      // W3. Change all ALs to R.
+      for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) {
+        var type$1 = types[i$2];
+        if (type$1 == "1" && cur == "r") { types[i$2] = "n"; }
+        else if (isStrong.test(type$1)) { cur = type$1; if (type$1 == "r") { types[i$2] = "R"; } }
+      }
+
+      // W4. A single European separator between two European numbers
+      // changes to a European number. A single common separator between
+      // two numbers of the same type changes to that type.
+      for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) {
+        var type$2 = types[i$3];
+        if (type$2 == "+" && prev$1 == "1" && types[i$3+1] == "1") { types[i$3] = "1"; }
+        else if (type$2 == "," && prev$1 == types[i$3+1] &&
+                 (prev$1 == "1" || prev$1 == "n")) { types[i$3] = prev$1; }
+        prev$1 = type$2;
+      }
+
+      // W5. A sequence of European terminators adjacent to European
+      // numbers changes to all European numbers.
+      // W6. Otherwise, separators and terminators change to Other
+      // Neutral.
+      for (var i$4 = 0; i$4 < len; ++i$4) {
+        var type$3 = types[i$4];
+        if (type$3 == ",") { types[i$4] = "N"; }
+        else if (type$3 == "%") {
+          var end = (void 0);
+          for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {}
+          var replace = (i$4 && types[i$4-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
+          for (var j = i$4; j < end; ++j) { types[j] = replace; }
+          i$4 = end - 1;
+        }
+      }
+
+      // W7. Search backwards from each instance of a European number
+      // until the first strong type (R, L, or sor) is found. If an L is
+      // found, then change the type of the European number to L.
+      for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) {
+        var type$4 = types[i$5];
+        if (cur$1 == "L" && type$4 == "1") { types[i$5] = "L"; }
+        else if (isStrong.test(type$4)) { cur$1 = type$4; }
+      }
+
+      // N1. A sequence of neutrals takes the direction of the
+      // surrounding strong text if the text on both sides has the same
+      // direction. European and Arabic numbers act as if they were R in
+      // terms of their influence on neutrals. Start-of-level-run (sor)
+      // and end-of-level-run (eor) are used at level run boundaries.
+      // N2. Any remaining neutrals take the embedding direction.
+      for (var i$6 = 0; i$6 < len; ++i$6) {
+        if (isNeutral.test(types[i$6])) {
+          var end$1 = (void 0);
+          for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {}
+          var before = (i$6 ? types[i$6-1] : outerType) == "L";
+          var after = (end$1 < len ? types[end$1] : outerType) == "L";
+          var replace$1 = before == after ? (before ? "L" : "R") : outerType;
+          for (var j$1 = i$6; j$1 < end$1; ++j$1) { types[j$1] = replace$1; }
+          i$6 = end$1 - 1;
+        }
+      }
+
+      // Here we depart from the documented algorithm, in order to avoid
+      // building up an actual levels array. Since there are only three
+      // levels (0, 1, 2) in an implementation that doesn't take
+      // explicit embedding into account, we can build up the order on
+      // the fly, without following the level-based algorithm.
+      var order = [], m;
+      for (var i$7 = 0; i$7 < len;) {
+        if (countsAsLeft.test(types[i$7])) {
+          var start = i$7;
+          for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {}
+          order.push(new BidiSpan(0, start, i$7));
+        } else {
+          var pos = i$7, at = order.length;
+          for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {}
+          for (var j$2 = pos; j$2 < i$7;) {
+            if (countsAsNum.test(types[j$2])) {
+              if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)); }
+              var nstart = j$2;
+              for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {}
+              order.splice(at, 0, new BidiSpan(2, nstart, j$2));
+              pos = j$2;
+            } else { ++j$2; }
+          }
+          if (pos < i$7) { order.splice(at, 0, new BidiSpan(1, pos, i$7)); }
+        }
+      }
+      if (direction == "ltr") {
+        if (order[0].level == 1 && (m = str.match(/^\s+/))) {
+          order[0].from = m[0].length;
+          order.unshift(new BidiSpan(0, 0, m[0].length));
+        }
+        if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
+          lst(order).to -= m[0].length;
+          order.push(new BidiSpan(0, len - m[0].length, len));
+        }
+      }
+
+      return direction == "rtl" ? order.reverse() : order
+    }
+  })();
+
+  // Get the bidi ordering for the given line (and cache it). Returns
+  // false for lines that are fully left-to-right, and an array of
+  // BidiSpan objects otherwise.
+  function getOrder(line, direction) {
+    var order = line.order;
+    if (order == null) { order = line.order = bidiOrdering(line.text, direction); }
+    return order
+  }
+
+  // EVENT HANDLING
+
+  // Lightweight event framework. on/off also work on DOM nodes,
+  // registering native DOM handlers.
+
+  var noHandlers = [];
+
+  var on = function(emitter, type, f) {
+    if (emitter.addEventListener) {
+      emitter.addEventListener(type, f, false);
+    } else if (emitter.attachEvent) {
+      emitter.attachEvent("on" + type, f);
+    } else {
+      var map$$1 = emitter._handlers || (emitter._handlers = {});
+      map$$1[type] = (map$$1[type] || noHandlers).concat(f);
+    }
+  };
+
+  function getHandlers(emitter, type) {
+    return emitter._handlers && emitter._handlers[type] || noHandlers
+  }
+
+  function off(emitter, type, f) {
+    if (emitter.removeEventListener) {
+      emitter.removeEventListener(type, f, false);
+    } else if (emitter.detachEvent) {
+      emitter.detachEvent("on" + type, f);
+    } else {
+      var map$$1 = emitter._handlers, arr = map$$1 && map$$1[type];
+      if (arr) {
+        var index = indexOf(arr, f);
+        if (index > -1)
+          { map$$1[type] = arr.slice(0, index).concat(arr.slice(index + 1)); }
+      }
+    }
+  }
+
+  function signal(emitter, type /*, values...*/) {
+    var handlers = getHandlers(emitter, type);
+    if (!handlers.length) { return }
+    var args = Array.prototype.slice.call(arguments, 2);
+    for (var i = 0; i < handlers.length; ++i) { handlers[i].apply(null, args); }
+  }
+
+  // The DOM events that CodeMirror handles can be overridden by
+  // registering a (non-DOM) handler on the editor for the event name,
+  // and preventDefault-ing the event in that handler.
+  function signalDOMEvent(cm, e, override) {
+    if (typeof e == "string")
+      { e = {type: e, preventDefault: function() { this.defaultPrevented = true; }}; }
+    signal(cm, override || e.type, cm, e);
+    return e_defaultPrevented(e) || e.codemirrorIgnore
+  }
+
+  function signalCursorActivity(cm) {
+    var arr = cm._handlers && cm._handlers.cursorActivity;
+    if (!arr) { return }
+    var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
+    for (var i = 0; i < arr.length; ++i) { if (indexOf(set, arr[i]) == -1)
+      { set.push(arr[i]); } }
+  }
+
+  function hasHandler(emitter, type) {
+    return getHandlers(emitter, type).length > 0
+  }
+
+  // Add on and off methods to a constructor's prototype, to make
+  // registering events on such objects more convenient.
+  function eventMixin(ctor) {
+    ctor.prototype.on = function(type, f) {on(this, type, f);};
+    ctor.prototype.off = function(type, f) {off(this, type, f);};
+  }
+
+  // Due to the fact that we still support jurassic IE versions, some
+  // compatibility wrappers are needed.
+
+  function e_preventDefault(e) {
+    if (e.preventDefault) { e.preventDefault(); }
+    else { e.returnValue = false; }
+  }
+  function e_stopPropagation(e) {
+    if (e.stopPropagation) { e.stopPropagation(); }
+    else { e.cancelBubble = true; }
+  }
+  function e_defaultPrevented(e) {
+    return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false
+  }
+  function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
+
+  function e_target(e) {return e.target || e.srcElement}
+  function e_button(e) {
+    var b = e.which;
+    if (b == null) {
+      if (e.button & 1) { b = 1; }
+      else if (e.button & 2) { b = 3; }
+      else if (e.button & 4) { b = 2; }
+    }
+    if (mac && e.ctrlKey && b == 1) { b = 3; }
+    return b
+  }
+
+  // Detect drag-and-drop
+  var dragAndDrop = function() {
+    // There is *some* kind of drag-and-drop support in IE6-8, but I
+    // couldn't get it to work yet.
+    if (ie && ie_version < 9) { return false }
+    var div = elt('div');
+    return "draggable" in div || "dragDrop" in div
+  }();
+
+  var zwspSupported;
+  function zeroWidthElement(measure) {
+    if (zwspSupported == null) {
+      var test = elt("span", "\u200b");
+      removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
+      if (measure.firstChild.offsetHeight != 0)
+        { zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); }
+    }
+    var node = zwspSupported ? elt("span", "\u200b") :
+      elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+    node.setAttribute("cm-text", "");
+    return node
+  }
+
+  // Feature-detect IE's crummy client rect reporting for bidi text
+  var badBidiRects;
+  function hasBadBidiRects(measure) {
+    if (badBidiRects != null) { return badBidiRects }
+    var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
+    var r0 = range(txt, 0, 1).getBoundingClientRect();
+    var r1 = range(txt, 1, 2).getBoundingClientRect();
+    removeChildren(measure);
+    if (!r0 || r0.left == r0.right) { return false } // Safari returns null in some cases (#2780)
+    return badBidiRects = (r1.right - r0.right < 3)
+  }
+
+  // See if "".split is the broken IE version, if so, provide an
+  // alternative way to split lines.
+  var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) {
+    var pos = 0, result = [], l = string.length;
+    while (pos <= l) {
+      var nl = string.indexOf("\n", pos);
+      if (nl == -1) { nl = string.length; }
+      var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
+      var rt = line.indexOf("\r");
+      if (rt != -1) {
+        result.push(line.slice(0, rt));
+        pos += rt + 1;
+      } else {
+        result.push(line);
+        pos = nl + 1;
+      }
+    }
+    return result
+  } : function (string) { return string.split(/\r\n?|\n/); };
+
+  var hasSelection = window.getSelection ? function (te) {
+    try { return te.selectionStart != te.selectionEnd }
+    catch(e) { return false }
+  } : function (te) {
+    var range$$1;
+    try {range$$1 = te.ownerDocument.selection.createRange();}
+    catch(e) {}
+    if (!range$$1 || range$$1.parentElement() != te) { return false }
+    return range$$1.compareEndPoints("StartToEnd", range$$1) != 0
+  };
+
+  var hasCopyEvent = (function () {
+    var e = elt("div");
+    if ("oncopy" in e) { return true }
+    e.setAttribute("oncopy", "return;");
+    return typeof e.oncopy == "function"
+  })();
+
+  var badZoomedRects = null;
+  function hasBadZoomedRects(measure) {
+    if (badZoomedRects != null) { return badZoomedRects }
+    var node = removeChildrenAndAdd(measure, elt("span", "x"));
+    var normal = node.getBoundingClientRect();
+    var fromRange = range(node, 0, 1).getBoundingClientRect();
+    return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1
+  }
+
+  // Known modes, by name and by MIME
+  var modes = {}, mimeModes = {};
+
+  // Extra arguments are stored as the mode's dependencies, which is
+  // used by (legacy) mechanisms like loadmode.js to automatically
+  // load a mode. (Preferred mechanism is the require/define calls.)
+  function defineMode(name, mode) {
+    if (arguments.length > 2)
+      { mode.dependencies = Array.prototype.slice.call(arguments, 2); }
+    modes[name] = mode;
+  }
+
+  function defineMIME(mime, spec) {
+    mimeModes[mime] = spec;
+  }
+
+  // Given a MIME type, a {name, ...options} config object, or a name
+  // string, return a mode config object.
+  function resolveMode(spec) {
+    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
+      spec = mimeModes[spec];
+    } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+      var found = mimeModes[spec.name];
+      if (typeof found == "string") { found = {name: found}; }
+      spec = createObj(found, spec);
+      spec.name = found.name;
+    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
+      return resolveMode("application/xml")
+    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
+      return resolveMode("application/json")
+    }
+    if (typeof spec == "string") { return {name: spec} }
+    else { return spec || {name: "null"} }
+  }
+
+  // Given a mode spec (anything that resolveMode accepts), find and
+  // initialize an actual mode object.
+  function getMode(options, spec) {
+    spec = resolveMode(spec);
+    var mfactory = modes[spec.name];
+    if (!mfactory) { return getMode(options, "text/plain") }
+    var modeObj = mfactory(options, spec);
+    if (modeExtensions.hasOwnProperty(spec.name)) {
+      var exts = modeExtensions[spec.name];
+      for (var prop in exts) {
+        if (!exts.hasOwnProperty(prop)) { continue }
+        if (modeObj.hasOwnProperty(prop)) { modeObj["_" + prop] = modeObj[prop]; }
+        modeObj[prop] = exts[prop];
+      }
+    }
+    modeObj.name = spec.name;
+    if (spec.helperType) { modeObj.helperType = spec.helperType; }
+    if (spec.modeProps) { for (var prop$1 in spec.modeProps)
+      { modeObj[prop$1] = spec.modeProps[prop$1]; } }
+
+    return modeObj
+  }
+
+  // This can be used to attach properties to mode objects from
+  // outside the actual mode definition.
+  var modeExtensions = {};
+  function extendMode(mode, properties) {
+    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
+    copyObj(properties, exts);
+  }
+
+  function copyState(mode, state) {
+    if (state === true) { return state }
+    if (mode.copyState) { return mode.copyState(state) }
+    var nstate = {};
+    for (var n in state) {
+      var val = state[n];
+      if (val instanceof Array) { val = val.concat([]); }
+      nstate[n] = val;
+    }
+    return nstate
+  }
+
+  // Given a mode and a state (for that mode), find the inner mode and
+  // state at the position that the state refers to.
+  function innerMode(mode, state) {
+    var info;
+    while (mode.innerMode) {
+      info = mode.innerMode(state);
+      if (!info || info.mode == mode) { break }
+      state = info.state;
+      mode = info.mode;
+    }
+    return info || {mode: mode, state: state}
+  }
+
+  function startState(mode, a1, a2) {
+    return mode.startState ? mode.startState(a1, a2) : true
+  }
+
+  // STRING STREAM
+
+  // Fed to the mode parsers, provides helper functions to make
+  // parsers more succinct.
+
+  var StringStream = function(string, tabSize, lineOracle) {
+    this.pos = this.start = 0;
+    this.string = string;
+    this.tabSize = tabSize || 8;
+    this.lastColumnPos = this.lastColumnValue = 0;
+    this.lineStart = 0;
+    this.lineOracle = lineOracle;
+  };
+
+  StringStream.prototype.eol = function () {return this.pos >= this.string.length};
+  StringStream.prototype.sol = function () {return this.pos == this.lineStart};
+  StringStream.prototype.peek = function () {return this.string.charAt(this.pos) || undefined};
+  StringStream.prototype.next = function () {
+    if (this.pos < this.string.length)
+      { return this.string.charAt(this.pos++) }
+  };
+  StringStream.prototype.eat = function (match) {
+    var ch = this.string.charAt(this.pos);
+    var ok;
+    if (typeof match == "string") { ok = ch == match; }
+    else { ok = ch && (match.test ? match.test(ch) : match(ch)); }
+    if (ok) {++this.pos; return ch}
+  };
+  StringStream.prototype.eatWhile = function (match) {
+    var start = this.pos;
+    while (this.eat(match)){}
+    return this.pos > start
+  };
+  StringStream.prototype.eatSpace = function () {
+      var this$1 = this;
+
+    var start = this.pos;
+    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { ++this$1.pos; }
+    return this.pos > start
+  };
+  StringStream.prototype.skipToEnd = function () {this.pos = this.string.length;};
+  StringStream.prototype.skipTo = function (ch) {
+    var found = this.string.indexOf(ch, this.pos);
+    if (found > -1) {this.pos = found; return true}
+  };
+  StringStream.prototype.backUp = function (n) {this.pos -= n;};
+  StringStream.prototype.column = function () {
+    if (this.lastColumnPos < this.start) {
+      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
+      this.lastColumnPos = this.start;
+    }
+    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
+  };
+  StringStream.prototype.indentation = function () {
+    return countColumn(this.string, null, this.tabSize) -
+      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
+  };
+  StringStream.prototype.match = function (pattern, consume, caseInsensitive) {
+    if (typeof pattern == "string") {
+      var cased = function (str) { return caseInsensitive ? str.toLowerCase() : str; };
+      var substr = this.string.substr(this.pos, pattern.length);
+      if (cased(substr) == cased(pattern)) {
+        if (consume !== false) { this.pos += pattern.length; }
+        return true
+      }
+    } else {
+      var match = this.string.slice(this.pos).match(pattern);
+      if (match && match.index > 0) { return null }
+      if (match && consume !== false) { this.pos += match[0].length; }
+      return match
+    }
+  };
+  StringStream.prototype.current = function (){return this.string.slice(this.start, this.pos)};
+  StringStream.prototype.hideFirstChars = function (n, inner) {
+    this.lineStart += n;
+    try { return inner() }
+    finally { this.lineStart -= n; }
+  };
+  StringStream.prototype.lookAhead = function (n) {
+    var oracle = this.lineOracle;
+    return oracle && oracle.lookAhead(n)
+  };
+  StringStream.prototype.baseToken = function () {
+    var oracle = this.lineOracle;
+    return oracle && oracle.baseToken(this.pos)
+  };
+
+  // Find the line object corresponding to the given line number.
+  function getLine(doc, n) {
+    n -= doc.first;
+    if (n < 0 || n >= doc.size) { throw new Error("There is no line " + (n + doc.first) + " in the document.") }
+    var chunk = doc;
+    while (!chunk.lines) {
+      for (var i = 0;; ++i) {
+        var child = chunk.children[i], sz = child.chunkSize();
+        if (n < sz) { chunk = child; break }
+        n -= sz;
+      }
+    }
+    return chunk.lines[n]
+  }
+
+  // Get the part of a document between two positions, as an array of
+  // strings.
+  function getBetween(doc, start, end) {
+    var out = [], n = start.line;
+    doc.iter(start.line, end.line + 1, function (line) {
+      var text = line.text;
+      if (n == end.line) { text = text.slice(0, end.ch); }
+      if (n == start.line) { text = text.slice(start.ch); }
+      out.push(text);
+      ++n;
+    });
+    return out
+  }
+  // Get the lines between from and to, as array of strings.
+  function getLines(doc, from, to) {
+    var out = [];
+    doc.iter(from, to, function (line) { out.push(line.text); }); // iter aborts when callback returns truthy value
+    return out
+  }
+
+  // Update the height of a line, propagating the height change
+  // upwards to parent nodes.
+  function updateLineHeight(line, height) {
+    var diff = height - line.height;
+    if (diff) { for (var n = line; n; n = n.parent) { n.height += diff; } }
+  }
+
+  // Given a line object, find its line number by walking up through
+  // its parent links.
+  function lineNo(line) {
+    if (line.parent == null) { return null }
+    var cur = line.parent, no = indexOf(cur.lines, line);
+    for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
+      for (var i = 0;; ++i) {
+        if (chunk.children[i] == cur) { break }
+        no += chunk.children[i].chunkSize();
+      }
+    }
+    return no + cur.first
+  }
+
+  // Find the line at the given vertical position, using the height
+  // information in the document tree.
+  function lineAtHeight(chunk, h) {
+    var n = chunk.first;
+    outer: do {
+      for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) {
+        var child = chunk.children[i$1], ch = child.height;
+        if (h < ch) { chunk = child; continue outer }
+        h -= ch;
+        n += child.chunkSize();
+      }
+      return n
+    } while (!chunk.lines)
+    var i = 0;
+    for (; i < chunk.lines.length; ++i) {
+      var line = chunk.lines[i], lh = line.height;
+      if (h < lh) { break }
+      h -= lh;
+    }
+    return n + i
+  }
+
+  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size}
+
+  function lineNumberFor(options, i) {
+    return String(options.lineNumberFormatter(i + options.firstLineNumber))
+  }
+
+  // A Pos instance represents a position within the text.
+  function Pos(line, ch, sticky) {
+    if ( sticky === void 0 ) sticky = null;
+
+    if (!(this instanceof Pos)) { return new Pos(line, ch, sticky) }
+    this.line = line;
+    this.ch = ch;
+    this.sticky = sticky;
+  }
+
+  // Compare two positions, return 0 if they are the same, a negative
+  // number when a is less, and a positive number otherwise.
+  function cmp(a, b) { return a.line - b.line || a.ch - b.ch }
+
+  function equalCursorPos(a, b) { return a.sticky == b.sticky && cmp(a, b) == 0 }
+
+  function copyPos(x) {return Pos(x.line, x.ch)}
+  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }
+  function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
+
+  // Most of the external API clips given positions to make sure they
+  // actually exist within the document.
+  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}
+  function clipPos(doc, pos) {
+    if (pos.line < doc.first) { return Pos(doc.first, 0) }
+    var last = doc.first + doc.size - 1;
+    if (pos.line > last) { return Pos(last, getLine(doc, last).text.length) }
+    return clipToLen(pos, getLine(doc, pos.line).text.length)
+  }
+  function clipToLen(pos, linelen) {
+    var ch = pos.ch;
+    if (ch == null || ch > linelen) { return Pos(pos.line, linelen) }
+    else if (ch < 0) { return Pos(pos.line, 0) }
+    else { return pos }
+  }
+  function clipPosArray(doc, array) {
+    var out = [];
+    for (var i = 0; i < array.length; i++) { out[i] = clipPos(doc, array[i]); }
+    return out
+  }
+
+  var SavedContext = function(state, lookAhead) {
+    this.state = state;
+    this.lookAhead = lookAhead;
+  };
+
+  var Context = function(doc, state, line, lookAhead) {
+    this.state = state;
+    this.doc = doc;
+    this.line = line;
+    this.maxLookAhead = lookAhead || 0;
+    this.baseTokens = null;
+    this.baseTokenPos = 1;
+  };
+
+  Context.prototype.lookAhead = function (n) {
+    var line = this.doc.getLine(this.line + n);
+    if (line != null && n > this.maxLookAhead) { this.maxLookAhead = n; }
+    return line
+  };
+
+  Context.prototype.baseToken = function (n) {
+      var this$1 = this;
+
+    if (!this.baseTokens) { return null }
+    while (this.baseTokens[this.baseTokenPos] <= n)
+      { this$1.baseTokenPos += 2; }
+    var type = this.baseTokens[this.baseTokenPos + 1];
+    return {type: type && type.replace(/( |^)overlay .*/, ""),
+            size: this.baseTokens[this.baseTokenPos] - n}
+  };
+
+  Context.prototype.nextLine = function () {
+    this.line++;
+    if (this.maxLookAhead > 0) { this.maxLookAhead--; }
+  };
+
+  Context.fromSaved = function (doc, saved, line) {
+    if (saved instanceof SavedContext)
+      { return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead) }
+    else
+      { return new Context(doc, copyState(doc.mode, saved), line) }
+  };
+
+  Context.prototype.save = function (copy) {
+    var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state;
+    return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state
+  };
+
+
+  // Compute a style array (an array starting with a mode generation
+  // -- for invalidation -- followed by pairs of end positions and
+  // style strings), which is used to highlight the tokens on the
+  // line.
+  function highlightLine(cm, line, context, forceToEnd) {
+    // A styles array always starts with a number identifying the
+    // mode/overlays that it is based on (for easy invalidation).
+    var st = [cm.state.modeGen], lineClasses = {};
+    // Compute the base array of styles
+    runMode(cm, line.text, cm.doc.mode, context, function (end, style) { return st.push(end, style); },
+            lineClasses, forceToEnd);
+    var state = context.state;
+
+    // Run overlays, adjust style array.
+    var loop = function ( o ) {
+      context.baseTokens = st;
+      var overlay = cm.state.overlays[o], i = 1, at = 0;
+      context.state = true;
+      runMode(cm, line.text, overlay.mode, context, function (end, style) {
+        var start = i;
+        // Ensure there's a token end at the current position, and that i points at it
+        while (at < end) {
+          var i_end = st[i];
+          if (i_end > end)
+            { st.splice(i, 1, end, st[i+1], i_end); }
+          i += 2;
+          at = Math.min(end, i_end);
+        }
+        if (!style) { return }
+        if (overlay.opaque) {
+          st.splice(start, i - start, end, "overlay " + style);
+          i = start + 2;
+        } else {
+          for (; start < i; start += 2) {
+            var cur = st[start+1];
+            st[start+1] = (cur ? cur + " " : "") + "overlay " + style;
+          }
+        }
+      }, lineClasses);
+      context.state = state;
+      context.baseTokens = null;
+      context.baseTokenPos = 1;
+    };
+
+    for (var o = 0; o < cm.state.overlays.length; ++o) loop( o );
+
+    return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
+  }
+
+  function getLineStyles(cm, line, updateFrontier) {
+    if (!line.styles || line.styles[0] != cm.state.modeGen) {
+      var context = getContextBefore(cm, lineNo(line));
+      var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state);
+      var result = highlightLine(cm, line, context);
+      if (resetState) { context.state = resetState; }
+      line.stateAfter = context.save(!resetState);
+      line.styles = result.styles;
+      if (result.classes) { line.styleClasses = result.classes; }
+      else if (line.styleClasses) { line.styleClasses = null; }
+      if (updateFrontier === cm.doc.highlightFrontier)
+        { cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); }
+    }
+    return line.styles
+  }
+
+  function getContextBefore(cm, n, precise) {
+    var doc = cm.doc, display = cm.display;
+    if (!doc.mode.startState) { return new Context(doc, true, n) }
+    var start = findStartLine(cm, n, precise);
+    var saved = start > doc.first && getLine(doc, start - 1).stateAfter;
+    var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start);
+
+    doc.iter(start, n, function (line) {
+      processLine(cm, line.text, context);
+      var pos = context.line;
+      line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null;
+      context.nextLine();
+    });
+    if (precise) { doc.modeFrontier = context.line; }
+    return context
+  }
+
+  // Lightweight form of highlight -- proceed over this line and
+  // update state, but don't save a style array. Used for lines that
+  // aren't currently visible.
+  function processLine(cm, text, context, startAt) {
+    var mode = cm.doc.mode;
+    var stream = new StringStream(text, cm.options.tabSize, context);
+    stream.start = stream.pos = startAt || 0;
+    if (text == "") { callBlankLine(mode, context.state); }
+    while (!stream.eol()) {
+      readToken(mode, stream, context.state);
+      stream.start = stream.pos;
+    }
+  }
+
+  function callBlankLine(mode, state) {
+    if (mode.blankLine) { return mode.blankLine(state) }
+    if (!mode.innerMode) { return }
+    var inner = innerMode(mode, state);
+    if (inner.mode.blankLine) { return inner.mode.blankLine(inner.state) }
+  }
+
+  function readToken(mode, stream, state, inner) {
+    for (var i = 0; i < 10; i++) {
+      if (inner) { inner[0] = innerMode(mode, state).mode; }
+      var style = mode.token(stream, state);
+      if (stream.pos > stream.start) { return style }
+    }
+    throw new Error("Mode " + mode.name + " failed to advance stream.")
+  }
+
+  var Token = function(stream, type, state) {
+    this.start = stream.start; this.end = stream.pos;
+    this.string = stream.current();
+    this.type = type || null;
+    this.state = state;
+  };
+
+  // Utility for getTokenAt and getLineTokens
+  function takeToken(cm, pos, precise, asArray) {
+    var doc = cm.doc, mode = doc.mode, style;
+    pos = clipPos(doc, pos);
+    var line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise);
+    var stream = new StringStream(line.text, cm.options.tabSize, context), tokens;
+    if (asArray) { tokens = []; }
+    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
+      stream.start = stream.pos;
+      style = readToken(mode, stream, context.state);
+      if (asArray) { tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); }
+    }
+    return asArray ? tokens : new Token(stream, style, context.state)
+  }
+
+  function extractLineClasses(type, output) {
+    if (type) { for (;;) {
+      var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
+      if (!lineClass) { break }
+      type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
+      var prop = lineClass[1] ? "bgClass" : "textClass";
+      if (output[prop] == null)
+        { output[prop] = lineClass[2]; }
+      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
+        { output[prop] += " " + lineClass[2]; }
+    } }
+    return type
+  }
+
+  // Run the given mode's parser over a line, calling f for each token.
+  function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) {
+    var flattenSpans = mode.flattenSpans;
+    if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans; }
+    var curStart = 0, curStyle = null;
+    var stream = new StringStream(text, cm.options.tabSize, context), style;
+    var inner = cm.options.addModeClass && [null];
+    if (text == "") { extractLineClasses(callBlankLine(mode, context.state), lineClasses); }
+    while (!stream.eol()) {
+      if (stream.pos > cm.options.maxHighlightLength) {
+        flattenSpans = false;
+        if (forceToEnd) { processLine(cm, text, context, stream.pos); }
+        stream.pos = text.length;
+        style = null;
+      } else {
+        style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses);
+      }
+      if (inner) {
+        var mName = inner[0].name;
+        if (mName) { style = "m-" + (style ? mName + " " + style : mName); }
+      }
+      if (!flattenSpans || curStyle != style) {
+        while (curStart < stream.start) {
+          curStart = Math.min(stream.start, curStart + 5000);
+          f(curStart, curStyle);
+        }
+        curStyle = style;
+      }
+      stream.start = stream.pos;
+    }
+    while (curStart < stream.pos) {
+      // Webkit seems to refuse to render text nodes longer than 57444
+      // characters, and returns inaccurate measurements in nodes
+      // starting around 5000 chars.
+      var pos = Math.min(stream.pos, curStart + 5000);
+      f(pos, curStyle);
+      curStart = pos;
+    }
+  }
+
+  // Finds the line to start with when starting a parse. Tries to
+  // find a line with a stateAfter, so that it can start with a
+  // valid state. If that fails, it returns the line with the
+  // smallest indentation, which tends to need the least context to
+  // parse correctly.
+  function findStartLine(cm, n, precise) {
+    var minindent, minline, doc = cm.doc;
+    var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
+    for (var search = n; search > lim; --search) {
+      if (search <= doc.first) { return doc.first }
+      var line = getLine(doc, search - 1), after = line.stateAfter;
+      if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier))
+        { return search }
+      var indented = countColumn(line.text, null, cm.options.tabSize);
+      if (minline == null || minindent > indented) {
+        minline = search - 1;
+        minindent = indented;
+      }
+    }
+    return minline
+  }
+
+  function retreatFrontier(doc, n) {
+    doc.modeFrontier = Math.min(doc.modeFrontier, n);
+    if (doc.highlightFrontier < n - 10) { return }
+    var start = doc.first;
+    for (var line = n - 1; line > start; line--) {
+      var saved = getLine(doc, line).stateAfter;
+      // change is on 3
+      // state on line 1 looked ahead 2 -- so saw 3
+      // test 1 + 2 < 3 should cover this
+      if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) {
+        start = line + 1;
+        break
+      }
+    }
+    doc.highlightFrontier = Math.min(doc.highlightFrontier, start);
+  }
+
+  // Optimize some code when these features are not used.
+  var sawReadOnlySpans = false, sawCollapsedSpans = false;
+
+  function seeReadOnlySpans() {
+    sawReadOnlySpans = true;
+  }
+
+  function seeCollapsedSpans() {
+    sawCollapsedSpans = true;
+  }
+
+  // TEXTMARKER SPANS
+
+  function MarkedSpan(marker, from, to) {
+    this.marker = marker;
+    this.from = from; this.to = to;
+  }
+
+  // Search an array of spans for a span matching the given marker.
+  function getMarkedSpanFor(spans, marker) {
+    if (spans) { for (var i = 0; i < spans.length; ++i) {
+      var span = spans[i];
+      if (span.marker == marker) { return span }
+    } }
+  }
+  // Remove a span from an array, returning undefined if no spans are
+  // left (we don't store arrays for lines without spans).
+  function removeMarkedSpan(spans, span) {
+    var r;
+    for (var i = 0; i < spans.length; ++i)
+      { if (spans[i] != span) { (r || (r = [])).push(spans[i]); } }
+    return r
+  }
+  // Add a span to a line.
+  function addMarkedSpan(line, span) {
+    line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
+    span.marker.attachLine(line);
+  }
+
+  // Used for the algorithm that adjusts markers for a change in the
+  // document. These functions cut an array of spans at a given
+  // character position, returning an array of remaining chunks (or
+  // undefined if nothing remains).
+  function markedSpansBefore(old, startCh, isInsert) {
+    var nw;
+    if (old) { for (var i = 0; i < old.length; ++i) {
+      var span = old[i], marker = span.marker;
+      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
+      if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
+        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh)
+        ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
+      }
+    } }
+    return nw
+  }
+  function markedSpansAfter(old, endCh, isInsert) {
+    var nw;
+    if (old) { for (var i = 0; i < old.length; ++i) {
+      var span = old[i], marker = span.marker;
+      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
+      if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
+        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh)
+        ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
+                                              span.to == null ? null : span.to - endCh));
+      }
+    } }
+    return nw
+  }
+
+  // Given a change object, compute the new set of marker spans that
+  // cover the line in which the change took place. Removes spans
+  // entirely within the change, reconnects spans belonging to the
+  // same marker that appear on both sides of the change, and cuts off
+  // spans partially within the change. Returns an array of span
+  // arrays with one element for each line in (after) the change.
+  function stretchSpansOverChange(doc, change) {
+    if (change.full) { return null }
+    var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
+    var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
+    if (!oldFirst && !oldLast) { return null }
+
+    var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
+    // Get the spans that 'stick out' on both sides
+    var first = markedSpansBefore(oldFirst, startCh, isInsert);
+    var last = markedSpansAfter(oldLast, endCh, isInsert);
+
+    // Next, merge those two ends
+    var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
+    if (first) {
+      // Fix up .to properties of first
+      for (var i = 0; i < first.length; ++i) {
+        var span = first[i];
+        if (span.to == null) {
+          var found = getMarkedSpanFor(last, span.marker);
+          if (!found) { span.to = startCh; }
+          else if (sameLine) { span.to = found.to == null ? null : found.to + offset; }
+        }
+      }
+    }
+    if (last) {
+      // Fix up .from in last (or move them into first in case of sameLine)
+      for (var i$1 = 0; i$1 < last.length; ++i$1) {
+        var span$1 = last[i$1];
+        if (span$1.to != null) { span$1.to += offset; }
+        if (span$1.from == null) {
+          var found$1 = getMarkedSpanFor(first, span$1.marker);
+          if (!found$1) {
+            span$1.from = offset;
+            if (sameLine) { (first || (first = [])).push(span$1); }
+          }
+        } else {
+          span$1.from += offset;
+          if (sameLine) { (first || (first = [])).push(span$1); }
+        }
+      }
+    }
+    // Make sure we didn't create any zero-length spans
+    if (first) { first = clearEmptySpans(first); }
+    if (last && last != first) { last = clearEmptySpans(last); }
+
+    var newMarkers = [first];
+    if (!sameLine) {
+      // Fill gap with whole-line-spans
+      var gap = change.text.length - 2, gapMarkers;
+      if (gap > 0 && first)
+        { for (var i$2 = 0; i$2 < first.length; ++i$2)
+          { if (first[i$2].to == null)
+            { (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)); } } }
+      for (var i$3 = 0; i$3 < gap; ++i$3)
+        { newMarkers.push(gapMarkers); }
+      newMarkers.push(last);
+    }
+    return newMarkers
+  }
+
+  // Remove spans that are empty and don't have a clearWhenEmpty
+  // option of false.
+  function clearEmptySpans(spans) {
+    for (var i = 0; i < spans.length; ++i) {
+      var span = spans[i];
+      if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
+        { spans.splice(i--, 1); }
+    }
+    if (!spans.length) { return null }
+    return spans
+  }
+
+  // Used to 'clip' out readOnly ranges when making a change.
+  function removeReadOnlyRanges(doc, from, to) {
+    var markers = null;
+    doc.iter(from.line, to.line + 1, function (line) {
+      if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
+        var mark = line.markedSpans[i].marker;
+        if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
+          { (markers || (markers = [])).push(mark); }
+      } }
+    });
+    if (!markers) { return null }
+    var parts = [{from: from, to: to}];
+    for (var i = 0; i < markers.length; ++i) {
+      var mk = markers[i], m = mk.find(0);
+      for (var j = 0; j < parts.length; ++j) {
+        var p = parts[j];
+        if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { continue }
+        var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
+        if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
+          { newParts.push({from: p.from, to: m.from}); }
+        if (dto > 0 || !mk.inclusiveRight && !dto)
+          { newParts.push({from: m.to, to: p.to}); }
+        parts.splice.apply(parts, newParts);
+        j += newParts.length - 3;
+      }
+    }
+    return parts
+  }
+
+  // Connect or disconnect spans from a line.
+  function detachMarkedSpans(line) {
+    var spans = line.markedSpans;
+    if (!spans) { return }
+    for (var i = 0; i < spans.length; ++i)
+      { spans[i].marker.detachLine(line); }
+    line.markedSpans = null;
+  }
+  function attachMarkedSpans(line, spans) {
+    if (!spans) { return }
+    for (var i = 0; i < spans.length; ++i)
+      { spans[i].marker.attachLine(line); }
+    line.markedSpans = spans;
+  }
+
+  // Helpers used when computing which overlapping collapsed span
+  // counts as the larger one.
+  function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 }
+  function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }
+
+  // Returns a number indicating which of two overlapping collapsed
+  // spans is larger (and thus includes the other). Falls back to
+  // comparing ids when the spans cover exactly the same range.
+  function compareCollapsedMarkers(a, b) {
+    var lenDiff = a.lines.length - b.lines.length;
+    if (lenDiff != 0) { return lenDiff }
+    var aPos = a.find(), bPos = b.find();
+    var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
+    if (fromCmp) { return -fromCmp }
+    var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
+    if (toCmp) { return toCmp }
+    return b.id - a.id
+  }
+
+  // Find out whether a line ends or starts in a collapsed span. If
+  // so, return the marker for that span.
+  function collapsedSpanAtSide(line, start) {
+    var sps = sawCollapsedSpans && line.markedSpans, found;
+    if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {
+      sp = sps[i];
+      if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
+          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
+        { found = sp.marker; }
+    } }
+    return found
+  }
+  function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
+  function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
+
+  function collapsedSpanAround(line, ch) {
+    var sps = sawCollapsedSpans && line.markedSpans, found;
+    if (sps) { for (var i = 0; i < sps.length; ++i) {
+      var sp = sps[i];
+      if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&
+          (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { found = sp.marker; }
+    } }
+    return found
+  }
+
+  // Test whether there exists a collapsed span that partially
+  // overlaps (covers the start or end, but not both) of a new span.
+  // Such overlap is not allowed.
+  function conflictingCollapsedRange(doc, lineNo$$1, from, to, marker) {
+    var line = getLine(doc, lineNo$$1);
+    var sps = sawCollapsedSpans && line.markedSpans;
+    if (sps) { for (var i = 0; i < sps.length; ++i) {
+      var sp = sps[i];
+      if (!sp.marker.collapsed) { continue }
+      var found = sp.marker.find(0);
+      var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
+      var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
+      if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue }
+      if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
+          fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
+        { return true }
+    } }
+  }
+
+  // A visual line is a line as drawn on the screen. Folding, for
+  // example, can cause multiple logical lines to appear on the same
+  // visual line. This finds the start of the visual line that the
+  // given line is part of (usually that is the line itself).
+  function visualLine(line) {
+    var merged;
+    while (merged = collapsedSpanAtStart(line))
+      { line = merged.find(-1, true).line; }
+    return line
+  }
+
+  function visualLineEnd(line) {
+    var merged;
+    while (merged = collapsedSpanAtEnd(line))
+      { line = merged.find(1, true).line; }
+    return line
+  }
+
+  // Returns an array of logical lines that continue the visual line
+  // started by the argument, or undefined if there are no such lines.
+  function visualLineContinued(line) {
+    var merged, lines;
+    while (merged = collapsedSpanAtEnd(line)) {
+      line = merged.find(1, true).line
+      ;(lines || (lines = [])).push(line);
+    }
+    return lines
+  }
+
+  // Get the line number of the start of the visual line that the
+  // given line number is part of.
+  function visualLineNo(doc, lineN) {
+    var line = getLine(doc, lineN), vis = visualLine(line);
+    if (line == vis) { return lineN }
+    return lineNo(vis)
+  }
+
+  // Get the line number of the start of the next visual line after
+  // the given line.
+  function visualLineEndNo(doc, lineN) {
+    if (lineN > doc.lastLine()) { return lineN }
+    var line = getLine(doc, lineN), merged;
+    if (!lineIsHidden(doc, line)) { return lineN }
+    while (merged = collapsedSpanAtEnd(line))
+      { line = merged.find(1, true).line; }
+    return lineNo(line) + 1
+  }
+
+  // Compute whether a line is hidden. Lines count as hidden when they
+  // are part of a visual line that starts with another line, or when
+  // they are entirely covered by collapsed, non-widget span.
+  function lineIsHidden(doc, line) {
+    var sps = sawCollapsedSpans && line.markedSpans;
+    if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {
+      sp = sps[i];
+      if (!sp.marker.collapsed) { continue }
+      if (sp.from == null) { return true }
+      if (sp.marker.widgetNode) { continue }
+      if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
+        { return true }
+    } }
+  }
+  function lineIsHiddenInner(doc, line, span) {
+    if (span.to == null) {
+      var end = span.marker.find(1, true);
+      return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))
+    }
+    if (span.marker.inclusiveRight && span.to == line.text.length)
+      { return true }
+    for (var sp = (void 0), i = 0; i < line.markedSpans.length; ++i) {
+      sp = line.markedSpans[i];
+      if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
+          (sp.to == null || sp.to != span.from) &&
+          (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
+          lineIsHiddenInner(doc, line, sp)) { return true }
+    }
+  }
+
+  // Find the height above the given line.
+  function heightAtLine(lineObj) {
+    lineObj = visualLine(lineObj);
+
+    var h = 0, chunk = lineObj.parent;
+    for (var i = 0; i < chunk.lines.length; ++i) {
+      var line = chunk.lines[i];
+      if (line == lineObj) { break }
+      else { h += line.height; }
+    }
+    for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
+      for (var i$1 = 0; i$1 < p.children.length; ++i$1) {
+        var cur = p.children[i$1];
+        if (cur == chunk) { break }
+        else { h += cur.height; }
+      }
+    }
+    return h
+  }
+
+  // Compute the character length of a line, taking into account
+  // collapsed ranges (see markText) that might hide parts, and join
+  // other lines onto it.
+  function lineLength(line) {
+    if (line.height == 0) { return 0 }
+    var len = line.text.length, merged, cur = line;
+    while (merged = collapsedSpanAtStart(cur)) {
+      var found = merged.find(0, true);
+      cur = found.from.line;
+      len += found.from.ch - found.to.ch;
+    }
+    cur = line;
+    while (merged = collapsedSpanAtEnd(cur)) {
+      var found$1 = merged.find(0, true);
+      len -= cur.text.length - found$1.from.ch;
+      cur = found$1.to.line;
+      len += cur.text.length - found$1.to.ch;
+    }
+    return len
+  }
+
+  // Find the longest line in the document.
+  function findMaxLine(cm) {
+    var d = cm.display, doc = cm.doc;
+    d.maxLine = getLine(doc, doc.first);
+    d.maxLineLength = lineLength(d.maxLine);
+    d.maxLineChanged = true;
+    doc.iter(function (line) {
+      var len = lineLength(line);
+      if (len > d.maxLineLength) {
+        d.maxLineLength = len;
+        d.maxLine = line;
+      }
+    });
+  }
+
+  // LINE DATA STRUCTURE
+
+  // Line objects. These hold state related to a line, including
+  // highlighting info (the styles array).
+  var Line = function(text, markedSpans, estimateHeight) {
+    this.text = text;
+    attachMarkedSpans(this, markedSpans);
+    this.height = estimateHeight ? estimateHeight(this) : 1;
+  };
+
+  Line.prototype.lineNo = function () { return lineNo(this) };
+  eventMixin(Line);
+
+  // Change the content (text, markers) of a line. Automatically
+  // invalidates cached information and tries to re-estimate the
+  // line's height.
+  function updateLine(line, text, markedSpans, estimateHeight) {
+    line.text = text;
+    if (line.stateAfter) { line.stateAfter = null; }
+    if (line.styles) { line.styles = null; }
+    if (line.order != null) { line.order = null; }
+    detachMarkedSpans(line);
+    attachMarkedSpans(line, markedSpans);
+    var estHeight = estimateHeight ? estimateHeight(line) : 1;
+    if (estHeight != line.height) { updateLineHeight(line, estHeight); }
+  }
+
+  // Detach a line from the document tree and its markers.
+  function cleanUpLine(line) {
+    line.parent = null;
+    detachMarkedSpans(line);
+  }
+
+  // Convert a style as returned by a mode (either null, or a string
+  // containing one or more styles) to a CSS style. This is cached,
+  // and also looks for line-wide styles.
+  var styleToClassCache = {}, styleToClassCacheWithMode = {};
+  function interpretTokenStyle(style, options) {
+    if (!style || /^\s*$/.test(style)) { return null }
+    var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
+    return cache[style] ||
+      (cache[style] = style.replace(/\S+/g, "cm-$&"))
+  }
+
+  // Render the DOM representation of the text of a line. Also builds
+  // up a 'line map', which points at the DOM nodes that represent
+  // specific stretches of text, and is used by the measuring code.
+  // The returned object contains the DOM node, this map, and
+  // information about line-wide styles that were set by the mode.
+  function buildLineContent(cm, lineView) {
+    // The padding-right forces the element to have a 'border', which
+    // is needed on Webkit to be able to get line-level bounding
+    // rectangles for it (in measureChar).
+    var content = eltP("span", null, null, webkit ? "padding-right: .1px" : null);
+    var builder = {pre: eltP("pre", [content], "CodeMirror-line"), content: content,
+                   col: 0, pos: 0, cm: cm,
+                   trailingSpace: false,
+                   splitSpaces: cm.getOption("lineWrapping")};
+    lineView.measure = {};
+
+    // Iterate over the logical lines that make up this visual line.
+    for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
+      var line = i ? lineView.rest[i - 1] : lineView.line, order = (void 0);
+      builder.pos = 0;
+      builder.addToken = buildToken;
+      // Optionally wire in some hacks into the token-rendering
+      // algorithm, to deal with browser quirks.
+      if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction)))
+        { builder.addToken = buildTokenBadBidi(builder.addToken, order); }
+      builder.map = [];
+      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
+      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
+      if (line.styleClasses) {
+        if (line.styleClasses.bgClass)
+          { builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || ""); }
+        if (line.styleClasses.textClass)
+          { builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || ""); }
+      }
+
+      // Ensure at least a single node is present, for measuring.
+      if (builder.map.length == 0)
+        { builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))); }
+
+      // Store the map and a cache object for the current logical line
+      if (i == 0) {
+        lineView.measure.map = builder.map;
+        lineView.measure.cache = {};
+      } else {
+  (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map)
+        ;(lineView.measure.caches || (lineView.measure.caches = [])).push({});
+      }
+    }
+
+    // See issue #2901
+    if (webkit) {
+      var last = builder.content.lastChild;
+      if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
+        { builder.content.className = "cm-tab-wrap-hack"; }
+    }
+
+    signal(cm, "renderLine", cm, lineView.line, builder.pre);
+    if (builder.pre.className)
+      { builder.textClass = joinClasses(builder.pre.className, builder.textClass || ""); }
+
+    return builder
+  }
+
+  function defaultSpecialCharPlaceholder(ch) {
+    var token = elt("span", "\u2022", "cm-invalidchar");
+    token.title = "\\u" + ch.charCodeAt(0).toString(16);
+    token.setAttribute("aria-label", token.title);
+    return token
+  }
+
+  // Build up the DOM representation for a single token, and add it to
+  // the line map. Takes care to render special characters separately.
+  function buildToken(builder, text, style, startStyle, endStyle, css, attributes) {
+    if (!text) { return }
+    var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text;
+    var special = builder.cm.state.specialChars, mustWrap = false;
+    var content;
+    if (!special.test(text)) {
+      builder.col += text.length;
+      content = document.createTextNode(displayText);
+      builder.map.push(builder.pos, builder.pos + text.length, content);
+      if (ie && ie_version < 9) { mustWrap = true; }
+      builder.pos += text.length;
+    } else {
+      content = document.createDocumentFragment();
+      var pos = 0;
+      while (true) {
+        special.lastIndex = pos;
+        var m = special.exec(text);
+        var skipped = m ? m.index - pos : text.length - pos;
+        if (skipped) {
+          var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
+          if (ie && ie_version < 9) { content.appendChild(elt("span", [txt])); }
+          else { content.appendChild(txt); }
+          builder.map.push(builder.pos, builder.pos + skipped, txt);
+          builder.col += skipped;
+          builder.pos += skipped;
+        }
+        if (!m) { break }
+        pos += skipped + 1;
+        var txt$1 = (void 0);
+        if (m[0] == "\t") {
+          var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
+          txt$1 = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
+          txt$1.setAttribute("role", "presentation");
+          txt$1.setAttribute("cm-text", "\t");
+          builder.col += tabWidth;
+        } else if (m[0] == "\r" || m[0] == "\n") {
+          txt$1 = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
+          txt$1.setAttribute("cm-text", m[0]);
+          builder.col += 1;
+        } else {
+          txt$1 = builder.cm.options.specialCharPlaceholder(m[0]);
+          txt$1.setAttribute("cm-text", m[0]);
+          if (ie && ie_version < 9) { content.appendChild(elt("span", [txt$1])); }
+          else { content.appendChild(txt$1); }
+          builder.col += 1;
+        }
+        builder.map.push(builder.pos, builder.pos + 1, txt$1);
+        builder.pos++;
+      }
+    }
+    builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32;
+    if (style || startStyle || endStyle || mustWrap || css) {
+      var fullStyle = style || "";
+      if (startStyle) { fullStyle += startStyle; }
+      if (endStyle) { fullStyle += endStyle; }
+      var token = elt("span", [content], fullStyle, css);
+      if (attributes) {
+        for (var attr in attributes) { if (attributes.hasOwnProperty(attr) && attr != "style" && attr != "class")
+          { token.setAttribute(attr, attributes[attr]); } }
+      }
+      return builder.content.appendChild(token)
+    }
+    builder.content.appendChild(content);
+  }
+
+  // Change some spaces to NBSP to prevent the browser from collapsing
+  // trailing spaces at the end of a line when rendering text (issue #1362).
+  function splitSpaces(text, trailingBefore) {
+    if (text.length > 1 && !/  /.test(text)) { return text }
+    var spaceBefore = trailingBefore, result = "";
+    for (var i = 0; i < text.length; i++) {
+      var ch = text.charAt(i);
+      if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
+        { ch = "\u00a0"; }
+      result += ch;
+      spaceBefore = ch == " ";
+    }
+    return result
+  }
+
+  // Work around nonsense dimensions being reported for stretches of
+  // right-to-left text.
+  function buildTokenBadBidi(inner, order) {
+    return function (builder, text, style, startStyle, endStyle, css, attributes) {
+      style = style ? style + " cm-force-border" : "cm-force-border";
+      var start = builder.pos, end = start + text.length;
+      for (;;) {
+        // Find the part that overlaps with the start of this text
+        var part = (void 0);
+        for (var i = 0; i < order.length; i++) {
+          part = order[i];
+          if (part.to > start && part.from <= start) { break }
+        }
+        if (part.to >= end) { return inner(builder, text, style, startStyle, endStyle, css, attributes) }
+        inner(builder, text.slice(0, part.to - start), style, startStyle, null, css, attributes);
+        startStyle = null;
+        text = text.slice(part.to - start);
+        start = part.to;
+      }
+    }
+  }
+
+  function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
+    var widget = !ignoreWidget && marker.widgetNode;
+    if (widget) { builder.map.push(builder.pos, builder.pos + size, widget); }
+    if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
+      if (!widget)
+        { widget = builder.content.appendChild(document.createElement("span")); }
+      widget.setAttribute("cm-marker", marker.id);
+    }
+    if (widget) {
+      builder.cm.display.input.setUneditable(widget);
+      builder.content.appendChild(widget);
+    }
+    builder.pos += size;
+    builder.trailingSpace = false;
+  }
+
+  // Outputs a number of spans to make up a line, taking highlighting
+  // and marked text into account.
+  function insertLineContent(line, builder, styles) {
+    var spans = line.markedSpans, allText = line.text, at = 0;
+    if (!spans) {
+      for (var i$1 = 1; i$1 < styles.length; i$1+=2)
+        { builder.addToken(builder, allText.slice(at, at = styles[i$1]), interpretTokenStyle(styles[i$1+1], builder.cm.options)); }
+      return
+    }
+
+    var len = allText.length, pos = 0, i = 1, text = "", style, css;
+    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, collapsed, attributes;
+    for (;;) {
+      if (nextChange == pos) { // Update current marker set
+        spanStyle = spanEndStyle = spanStartStyle = css = "";
+        attributes = null;
+        collapsed = null; nextChange = Infinity;
+        var foundBookmarks = [], endStyles = (void 0);
+        for (var j = 0; j < spans.length; ++j) {
+          var sp = spans[j], m = sp.marker;
+          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
+            foundBookmarks.push(m);
+          } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
+            if (sp.to != null && sp.to != pos && nextChange > sp.to) {
+              nextChange = sp.to;
+              spanEndStyle = "";
+            }
+            if (m.className) { spanStyle += " " + m.className; }
+            if (m.css) { css = (css ? css + ";" : "") + m.css; }
+            if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; }
+            if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); }
+            // support for the old title property
+            // https://github.com/codemirror/CodeMirror/pull/5673
+            if (m.title) { (attributes || (attributes = {})).title = m.title; }
+            if (m.attributes) {
+              for (var attr in m.attributes)
+                { (attributes || (attributes = {}))[attr] = m.attributes[attr]; }
+            }
+            if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
+              { collapsed = sp; }
+          } else if (sp.from > pos && nextChange > sp.from) {
+            nextChange = sp.from;
+          }
+        }
+        if (endStyles) { for (var j$1 = 0; j$1 < endStyles.length; j$1 += 2)
+          { if (endStyles[j$1 + 1] == nextChange) { spanEndStyle += " " + endStyles[j$1]; } } }
+
+        if (!collapsed || collapsed.from == pos) { for (var j$2 = 0; j$2 < foundBookmarks.length; ++j$2)
+          { buildCollapsedSpan(builder, 0, foundBookmarks[j$2]); } }
+        if (collapsed && (collapsed.from || 0) == pos) {
+          buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
+                             collapsed.marker, collapsed.from == null);
+          if (collapsed.to == null) { return }
+          if (collapsed.to == pos) { collapsed = false; }
+        }
+      }
+      if (pos >= len) { break }
+
+      var upto = Math.min(len, nextChange);
+      while (true) {
+        if (text) {
+          var end = pos + text.length;
+          if (!collapsed) {
+            var tokenText = end > upto ? text.slice(0, upto - pos) : text;
+            builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
+                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", css, attributes);
+          }
+          if (end >= upto) {text = text.slice(upto - pos); pos = upto; break}
+          pos = end;
+          spanStartStyle = "";
+        }
+        text = allText.slice(at, at = styles[i++]);
+        style = interpretTokenStyle(styles[i++], builder.cm.options);
+      }
+    }
+  }
+
+
+  // These objects are used to represent the visible (currently drawn)
+  // part of the document. A LineView may correspond to multiple
+  // logical lines, if those are connected by collapsed ranges.
+  function LineView(doc, line, lineN) {
+    // The starting line
+    this.line = line;
+    // Continuing lines, if any
+    this.rest = visualLineContinued(line);
+    // Number of logical lines in this visual line
+    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
+    this.node = this.text = null;
+    this.hidden = lineIsHidden(doc, line);
+  }
+
+  // Create a range of LineView objects for the given lines.
+  function buildViewArray(cm, from, to) {
+    var array = [], nextPos;
+    for (var pos = from; pos < to; pos = nextPos) {
+      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
+      nextPos = pos + view.size;
+      array.push(view);
+    }
+    return array
+  }
+
+  var operationGroup = null;
+
+  function pushOperation(op) {
+    if (operationGroup) {
+      operationGroup.ops.push(op);
+    } else {
+      op.ownsGroup = operationGroup = {
+        ops: [op],
+        delayedCallbacks: []
+      };
+    }
+  }
+
+  function fireCallbacksForOps(group) {
+    // Calls delayed callbacks and cursorActivity handlers until no
+    // new ones appear
+    var callbacks = group.delayedCallbacks, i = 0;
+    do {
+      for (; i < callbacks.length; i++)
+        { callbacks[i].call(null); }
+      for (var j = 0; j < group.ops.length; j++) {
+        var op = group.ops[j];
+        if (op.cursorActivityHandlers)
+          { while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
+            { op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm); } }
+      }
+    } while (i < callbacks.length)
+  }
+
+  function finishOperation(op, endCb) {
+    var group = op.ownsGroup;
+    if (!group) { return }
+
+    try { fireCallbacksForOps(group); }
+    finally {
+      operationGroup = null;
+      endCb(group);
+    }
+  }
+
+  var orphanDelayedCallbacks = null;
+
+  // Often, we want to signal events at a point where we are in the
+  // middle of some work, but don't want the handler to start calling
+  // other methods on the editor, which might be in an inconsistent
+  // state or simply not expect any other events to happen.
+  // signalLater looks whether there are any handlers, and schedules
+  // them to be executed when the last operation ends, or, if no
+  // operation is active, when a timeout fires.
+  function signalLater(emitter, type /*, values...*/) {
+    var arr = getHandlers(emitter, type);
+    if (!arr.length) { return }
+    var args = Array.prototype.slice.call(arguments, 2), list;
+    if (operationGroup) {
+      list = operationGroup.delayedCallbacks;
+    } else if (orphanDelayedCallbacks) {
+      list = orphanDelayedCallbacks;
+    } else {
+      list = orphanDelayedCallbacks = [];
+      setTimeout(fireOrphanDelayed, 0);
+    }
+    var loop = function ( i ) {
+      list.push(function () { return arr[i].apply(null, args); });
+    };
+
+    for (var i = 0; i < arr.length; ++i)
+      loop( i );
+  }
+
+  function fireOrphanDelayed() {
+    var delayed = orphanDelayedCallbacks;
+    orphanDelayedCallbacks = null;
+    for (var i = 0; i < delayed.length; ++i) { delayed[i](); }
+  }
+
+  // When an aspect of a line changes, a string is added to
+  // lineView.changes. This updates the relevant part of the line's
+  // DOM structure.
+  function updateLineForChanges(cm, lineView, lineN, dims) {
+    for (var j = 0; j < lineView.changes.length; j++) {
+      var type = lineView.changes[j];
+      if (type == "text") { updateLineText(cm, lineView); }
+      else if (type == "gutter") { updateLineGutter(cm, lineView, lineN, dims); }
+      else if (type == "class") { updateLineClasses(cm, lineView); }
+      else if (type == "widget") { updateLineWidgets(cm, lineView, dims); }
+    }
+    lineView.changes = null;
+  }
+
+  // Lines with gutter elements, widgets or a background class need to
+  // be wrapped, and have the extra elements added to the wrapper div
+  function ensureLineWrapped(lineView) {
+    if (lineView.node == lineView.text) {
+      lineView.node = elt("div", null, null, "position: relative");
+      if (lineView.text.parentNode)
+        { lineView.text.parentNode.replaceChild(lineView.node, lineView.text); }
+      lineView.node.appendChild(lineView.text);
+      if (ie && ie_version < 8) { lineView.node.style.zIndex = 2; }
+    }
+    return lineView.node
+  }
+
+  function updateLineBackground(cm, lineView) {
+    var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
+    if (cls) { cls += " CodeMirror-linebackground"; }
+    if (lineView.background) {
+      if (cls) { lineView.background.className = cls; }
+      else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
+    } else if (cls) {
+      var wrap = ensureLineWrapped(lineView);
+      lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
+      cm.display.input.setUneditable(lineView.background);
+    }
+  }
+
+  // Wrapper around buildLineContent which will reuse the structure
+  // in display.externalMeasured when possible.
+  function getLineContent(cm, lineView) {
+    var ext = cm.display.externalMeasured;
+    if (ext && ext.line == lineView.line) {
+      cm.display.externalMeasured = null;
+      lineView.measure = ext.measure;
+      return ext.built
+    }
+    return buildLineContent(cm, lineView)
+  }
+
+  // Redraw the line's text. Interacts with the background and text
+  // classes because the mode may output tokens that influence these
+  // classes.
+  function updateLineText(cm, lineView) {
+    var cls = lineView.text.className;
+    var built = getLineContent(cm, lineView);
+    if (lineView.text == lineView.node) { lineView.node = built.pre; }
+    lineView.text.parentNode.replaceChild(built.pre, lineView.text);
+    lineView.text = built.pre;
+    if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
+      lineView.bgClass = built.bgClass;
+      lineView.textClass = built.textClass;
+      updateLineClasses(cm, lineView);
+    } else if (cls) {
+      lineView.text.className = cls;
+    }
+  }
+
+  function updateLineClasses(cm, lineView) {
+    updateLineBackground(cm, lineView);
+    if (lineView.line.wrapClass)
+      { ensureLineWrapped(lineView).className = lineView.line.wrapClass; }
+    else if (lineView.node != lineView.text)
+      { lineView.node.className = ""; }
+    var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
+    lineView.text.className = textClass || "";
+  }
+
+  function updateLineGutter(cm, lineView, lineN, dims) {
+    if (lineView.gutter) {
+      lineView.node.removeChild(lineView.gutter);
+      lineView.gutter = null;
+    }
+    if (lineView.gutterBackground) {
+      lineView.node.removeChild(lineView.gutterBackground);
+      lineView.gutterBackground = null;
+    }
+    if (lineView.line.gutterClass) {
+      var wrap = ensureLineWrapped(lineView);
+      lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
+                                      ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + (dims.gutterTotalWidth) + "px"));
+      cm.display.input.setUneditable(lineView.gutterBackground);
+      wrap.insertBefore(lineView.gutterBackground, lineView.text);
+    }
+    var markers = lineView.line.gutterMarkers;
+    if (cm.options.lineNumbers || markers) {
+      var wrap$1 = ensureLineWrapped(lineView);
+      var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"));
+      cm.display.input.setUneditable(gutterWrap);
+      wrap$1.insertBefore(gutterWrap, lineView.text);
+      if (lineView.line.gutterClass)
+        { gutterWrap.className += " " + lineView.line.gutterClass; }
+      if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
+        { lineView.lineNumber = gutterWrap.appendChild(
+          elt("div", lineNumberFor(cm.options, lineN),
+              "CodeMirror-linenumber CodeMirror-gutter-elt",
+              ("left: " + (dims.gutterLeft["CodeMirror-linenumbers"]) + "px; width: " + (cm.display.lineNumInnerWidth) + "px"))); }
+      if (markers) { for (var k = 0; k < cm.display.gutterSpecs.length; ++k) {
+        var id = cm.display.gutterSpecs[k].className, found = markers.hasOwnProperty(id) && markers[id];
+        if (found)
+          { gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt",
+                                     ("left: " + (dims.gutterLeft[id]) + "px; width: " + (dims.gutterWidth[id]) + "px"))); }
+      } }
+    }
+  }
+
+  function updateLineWidgets(cm, lineView, dims) {
+    if (lineView.alignable) { lineView.alignable = null; }
+    var isWidget = classTest("CodeMirror-linewidget");
+    for (var node = lineView.node.firstChild, next = (void 0); node; node = next) {
+      next = node.nextSibling;
+      if (isWidget.test(node)) { lineView.node.removeChild(node); }
+    }
+    insertLineWidgets(cm, lineView, dims);
+  }
+
+  // Build a line's DOM representation from scratch
+  function buildLineElement(cm, lineView, lineN, dims) {
+    var built = getLineContent(cm, lineView);
+    lineView.text = lineView.node = built.pre;
+    if (built.bgClass) { lineView.bgClass = built.bgClass; }
+    if (built.textClass) { lineView.textClass = built.textClass; }
+
+    updateLineClasses(cm, lineView);
+    updateLineGutter(cm, lineView, lineN, dims);
+    insertLineWidgets(cm, lineView, dims);
+    return lineView.node
+  }
+
+  // A lineView may contain multiple logical lines (when merged by
+  // collapsed spans). The widgets for all of them need to be drawn.
+  function insertLineWidgets(cm, lineView, dims) {
+    insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
+    if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
+      { insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false); } }
+  }
+
+  function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
+    if (!line.widgets) { return }
+    var wrap = ensureLineWrapped(lineView);
+    for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
+      var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : ""));
+      if (!widget.handleMouseEvents) { node.setAttribute("cm-ignore-events", "true"); }
+      positionLineWidget(widget, node, lineView, dims);
+      cm.display.input.setUneditable(node);
+      if (allowAbove && widget.above)
+        { wrap.insertBefore(node, lineView.gutter || lineView.text); }
+      else
+        { wrap.appendChild(node); }
+      signalLater(widget, "redraw");
+    }
+  }
+
+  function positionLineWidget(widget, node, lineView, dims) {
+    if (widget.noHScroll) {
+  (lineView.alignable || (lineView.alignable = [])).push(node);
+      var width = dims.wrapperWidth;
+      node.style.left = dims.fixedPos + "px";
+      if (!widget.coverGutter) {
+        width -= dims.gutterTotalWidth;
+        node.style.paddingLeft = dims.gutterTotalWidth + "px";
+      }
+      node.style.width = width + "px";
+    }
+    if (widget.coverGutter) {
+      node.style.zIndex = 5;
+      node.style.position = "relative";
+      if (!widget.noHScroll) { node.style.marginLeft = -dims.gutterTotalWidth + "px"; }
+    }
+  }
+
+  function widgetHeight(widget) {
+    if (widget.height != null) { return widget.height }
+    var cm = widget.doc.cm;
+    if (!cm) { return 0 }
+    if (!contains(document.body, widget.node)) {
+      var parentStyle = "position: relative;";
+      if (widget.coverGutter)
+        { parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"; }
+      if (widget.noHScroll)
+        { parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;"; }
+      removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
+    }
+    return widget.height = widget.node.parentNode.offsetHeight
+  }
+
+  // Return true when the given mouse event happened in a widget
+  function eventInWidget(display, e) {
+    for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
+      if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
+          (n.parentNode == display.sizer && n != display.mover))
+        { return true }
+    }
+  }
+
+  // POSITION MEASUREMENT
+
+  function paddingTop(display) {return display.lineSpace.offsetTop}
+  function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
+  function paddingH(display) {
+    if (display.cachedPaddingH) { return display.cachedPaddingH }
+    var e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like"));
+    var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
+    var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
+    if (!isNaN(data.left) && !isNaN(data.right)) { display.cachedPaddingH = data; }
+    return data
+  }
+
+  function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth }
+  function displayWidth(cm) {
+    return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth
+  }
+  function displayHeight(cm) {
+    return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight
+  }
+
+  // Ensure the lineView.wrapping.heights array is populated. This is
+  // an array of bottom offsets for the lines that make up a drawn
+  // line. When lineWrapping is on, there might be more than one
+  // height.
+  function ensureLineHeights(cm, lineView, rect) {
+    var wrapping = cm.options.lineWrapping;
+    var curWidth = wrapping && displayWidth(cm);
+    if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
+      var heights = lineView.measure.heights = [];
+      if (wrapping) {
+        lineView.measure.width = curWidth;
+        var rects = lineView.text.firstChild.getClientRects();
+        for (var i = 0; i < rects.length - 1; i++) {
+          var cur = rects[i], next = rects[i + 1];
+          if (Math.abs(cur.bottom - next.bottom) > 2)
+            { heights.push((cur.bottom + next.top) / 2 - rect.top); }
+        }
+      }
+      heights.push(rect.bottom - rect.top);
+    }
+  }
+
+  // Find a line map (mapping character offsets to text nodes) and a
+  // measurement cache for the given line number. (A line view might
+  // contain multiple lines when collapsed ranges are present.)
+  function mapFromLineView(lineView, line, lineN) {
+    if (lineView.line == line)
+      { return {map: lineView.measure.map, cache: lineView.measure.cache} }
+    for (var i = 0; i < lineView.rest.length; i++)
+      { if (lineView.rest[i] == line)
+        { return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} } }
+    for (var i$1 = 0; i$1 < lineView.rest.length; i$1++)
+      { if (lineNo(lineView.rest[i$1]) > lineN)
+        { return {map: lineView.measure.maps[i$1], cache: lineView.measure.caches[i$1], before: true} } }
+  }
+
+  // Render a line into the hidden node display.externalMeasured. Used
+  // when measurement is needed for a line that's not in the viewport.
+  function updateExternalMeasurement(cm, line) {
+    line = visualLine(line);
+    var lineN = lineNo(line);
+    var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
+    view.lineN = lineN;
+    var built = view.built = buildLineContent(cm, view);
+    view.text = built.pre;
+    removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
+    return view
+  }
+
+  // Get a {top, bottom, left, right} box (in line-local coordinates)
+  // for a given character.
+  function measureChar(cm, line, ch, bias) {
+    return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias)
+  }
+
+  // Find a line view that corresponds to the given line number.
+  function findViewForLine(cm, lineN) {
+    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
+      { return cm.display.view[findViewIndex(cm, lineN)] }
+    var ext = cm.display.externalMeasured;
+    if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
+      { return ext }
+  }
+
+  // Measurement can be split in two steps, the set-up work that
+  // applies to the whole line, and the measurement of the actual
+  // character. Functions like coordsChar, that need to do a lot of
+  // measurements in a row, can thus ensure that the set-up work is
+  // only done once.
+  function prepareMeasureForLine(cm, line) {
+    var lineN = lineNo(line);
+    var view = findViewForLine(cm, lineN);
+    if (view && !view.text) {
+      view = null;
+    } else if (view && view.changes) {
+      updateLineForChanges(cm, view, lineN, getDimensions(cm));
+      cm.curOp.forceUpdate = true;
+    }
+    if (!view)
+      { view = updateExternalMeasurement(cm, line); }
+
+    var info = mapFromLineView(view, line, lineN);
+    return {
+      line: line, view: view, rect: null,
+      map: info.map, cache: info.cache, before: info.before,
+      hasHeights: false
+    }
+  }
+
+  // Given a prepared measurement object, measures the position of an
+  // actual character (or fetches it from the cache).
+  function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
+    if (prepared.before) { ch = -1; }
+    var key = ch + (bias || ""), found;
+    if (prepared.cache.hasOwnProperty(key)) {
+      found = prepared.cache[key];
+    } else {
+      if (!prepared.rect)
+        { prepared.rect = prepared.view.text.getBoundingClientRect(); }
+      if (!prepared.hasHeights) {
+        ensureLineHeights(cm, prepared.view, prepared.rect);
+        prepared.hasHeights = true;
+      }
+      found = measureCharInner(cm, prepared, ch, bias);
+      if (!found.bogus) { prepared.cache[key] = found; }
+    }
+    return {left: found.left, right: found.right,
+            top: varHeight ? found.rtop : found.top,
+            bottom: varHeight ? found.rbottom : found.bottom}
+  }
+
+  var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
+
+  function nodeAndOffsetInLineMap(map$$1, ch, bias) {
+    var node, start, end, collapse, mStart, mEnd;
+    // First, search the line map for the text node corresponding to,
+    // or closest to, the target character.
+    for (var i = 0; i < map$$1.length; i += 3) {
+      mStart = map$$1[i];
+      mEnd = map$$1[i + 1];
+      if (ch < mStart) {
+        start = 0; end = 1;
+        collapse = "left";
+      } else if (ch < mEnd) {
+        start = ch - mStart;
+        end = start + 1;
+      } else if (i == map$$1.length - 3 || ch == mEnd && map$$1[i + 3] > ch) {
+        end = mEnd - mStart;
+        start = end - 1;
+        if (ch >= mEnd) { collapse = "right"; }
+      }
+      if (start != null) {
+        node = map$$1[i + 2];
+        if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
+          { collapse = bias; }
+        if (bias == "left" && start == 0)
+          { while (i && map$$1[i - 2] == map$$1[i - 3] && map$$1[i - 1].insertLeft) {
+            node = map$$1[(i -= 3) + 2];
+            collapse = "left";
+          } }
+        if (bias == "right" && start == mEnd - mStart)
+          { while (i < map$$1.length - 3 && map$$1[i + 3] == map$$1[i + 4] && !map$$1[i + 5].insertLeft) {
+            node = map$$1[(i += 3) + 2];
+            collapse = "right";
+          } }
+        break
+      }
+    }
+    return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd}
+  }
+
+  function getUsefulRect(rects, bias) {
+    var rect = nullRect;
+    if (bias == "left") { for (var i = 0; i < rects.length; i++) {
+      if ((rect = rects[i]).left != rect.right) { break }
+    } } else { for (var i$1 = rects.length - 1; i$1 >= 0; i$1--) {
+      if ((rect = rects[i$1]).left != rect.right) { break }
+    } }
+    return rect
+  }
+
+  function measureCharInner(cm, prepared, ch, bias) {
+    var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
+    var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
+
+    var rect;
+    if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
+      for (var i$1 = 0; i$1 < 4; i$1++) { // Retry a maximum of 4 times when nonsense rectangles are returned
+        while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) { --start; }
+        while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) { ++end; }
+        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
+          { rect = node.parentNode.getBoundingClientRect(); }
+        else
+          { rect = getUsefulRect(range(node, start, end).getClientRects(), bias); }
+        if (rect.left || rect.right || start == 0) { break }
+        end = start;
+        start = start - 1;
+        collapse = "right";
+      }
+      if (ie && ie_version < 11) { rect = maybeUpdateRectForZooming(cm.display.measure, rect); }
+    } else { // If it is a widget, simply get the box for the whole widget.
+      if (start > 0) { collapse = bias = "right"; }
+      var rects;
+      if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
+        { rect = rects[bias == "right" ? rects.length - 1 : 0]; }
+      else
+        { rect = node.getBoundingClientRect(); }
+    }
+    if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
+      var rSpan = node.parentNode.getClientRects()[0];
+      if (rSpan)
+        { rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom}; }
+      else
+        { rect = nullRect; }
+    }
+
+    var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
+    var mid = (rtop + rbot) / 2;
+    var heights = prepared.view.measure.heights;
+    var i = 0;
+    for (; i < heights.length - 1; i++)
+      { if (mid < heights[i]) { break } }
+    var top = i ? heights[i - 1] : 0, bot = heights[i];
+    var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
+                  right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
+                  top: top, bottom: bot};
+    if (!rect.left && !rect.right) { result.bogus = true; }
+    if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
+
+    return result
+  }
+
+  // Work around problem with bounding client rects on ranges being
+  // returned incorrectly when zoomed on IE10 and below.
+  function maybeUpdateRectForZooming(measure, rect) {
+    if (!window.screen || screen.logicalXDPI == null ||
+        screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
+      { return rect }
+    var scaleX = screen.logicalXDPI / screen.deviceXDPI;
+    var scaleY = screen.logicalYDPI / screen.deviceYDPI;
+    return {left: rect.left * scaleX, right: rect.right * scaleX,
+            top: rect.top * scaleY, bottom: rect.bottom * scaleY}
+  }
+
+  function clearLineMeasurementCacheFor(lineView) {
+    if (lineView.measure) {
+      lineView.measure.cache = {};
+      lineView.measure.heights = null;
+      if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
+        { lineView.measure.caches[i] = {}; } }
+    }
+  }
+
+  function clearLineMeasurementCache(cm) {
+    cm.display.externalMeasure = null;
+    removeChildren(cm.display.lineMeasure);
+    for (var i = 0; i < cm.display.view.length; i++)
+      { clearLineMeasurementCacheFor(cm.display.view[i]); }
+  }
+
+  function clearCaches(cm) {
+    clearLineMeasurementCache(cm);
+    cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
+    if (!cm.options.lineWrapping) { cm.display.maxLineChanged = true; }
+    cm.display.lineNumChars = null;
+  }
+
+  function pageScrollX() {
+    // Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206
+    // which causes page_Offset and bounding client rects to use
+    // different reference viewports and invalidate our calculations.
+    if (chrome && android) { return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft)) }
+    return window.pageXOffset || (document.documentElement || document.body).scrollLeft
+  }
+  function pageScrollY() {
+    if (chrome && android) { return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop)) }
+    return window.pageYOffset || (document.documentElement || document.body).scrollTop
+  }
+
+  function widgetTopHeight(lineObj) {
+    var height = 0;
+    if (lineObj.widgets) { for (var i = 0; i < lineObj.widgets.length; ++i) { if (lineObj.widgets[i].above)
+      { height += widgetHeight(lineObj.widgets[i]); } } }
+    return height
+  }
+
+  // Converts a {top, bottom, left, right} box from line-local
+  // coordinates into another coordinate system. Context may be one of
+  // "line", "div" (display.lineDiv), "local"./null (editor), "window",
+  // or "page".
+  function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) {
+    if (!includeWidgets) {
+      var height = widgetTopHeight(lineObj);
+      rect.top += height; rect.bottom += height;
+    }
+    if (context == "line") { return rect }
+    if (!context) { context = "local"; }
+    var yOff = heightAtLine(lineObj);
+    if (context == "local") { yOff += paddingTop(cm.display); }
+    else { yOff -= cm.display.viewOffset; }
+    if (context == "page" || context == "window") {
+      var lOff = cm.display.lineSpace.getBoundingClientRect();
+      yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
+      var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
+      rect.left += xOff; rect.right += xOff;
+    }
+    rect.top += yOff; rect.bottom += yOff;
+    return rect
+  }
+
+  // Coverts a box from "div" coords to another coordinate system.
+  // Context may be "window", "page", "div", or "local"./null.
+  function fromCoordSystem(cm, coords, context) {
+    if (context == "div") { return coords }
+    var left = coords.left, top = coords.top;
+    // First move into "page" coordinate system
+    if (context == "page") {
+      left -= pageScrollX();
+      top -= pageScrollY();
+    } else if (context == "local" || !context) {
+      var localBox = cm.display.sizer.getBoundingClientRect();
+      left += localBox.left;
+      top += localBox.top;
+    }
+
+    var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
+    return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}
+  }
+
+  function charCoords(cm, pos, context, lineObj, bias) {
+    if (!lineObj) { lineObj = getLine(cm.doc, pos.line); }
+    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context)
+  }
+
+  // Returns a box for a given cursor position, which may have an
+  // 'other' property containing the position of the secondary cursor
+  // on a bidi boundary.
+  // A cursor Pos(line, char, "before") is on the same visual line as `char - 1`
+  // and after `char - 1` in writing order of `char - 1`
+  // A cursor Pos(line, char, "after") is on the same visual line as `char`
+  // and before `char` in writing order of `char`
+  // Examples (upper-case letters are RTL, lower-case are LTR):
+  //     Pos(0, 1, ...)
+  //     before   after
+  // ab     a|b     a|b
+  // aB     a|B     aB|
+  // Ab     |Ab     A|b
+  // AB     B|A     B|A
+  // Every position after the last character on a line is considered to stick
+  // to the last character on the line.
+  function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
+    lineObj = lineObj || getLine(cm.doc, pos.line);
+    if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj); }
+    function get(ch, right) {
+      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
+      if (right) { m.left = m.right; } else { m.right = m.left; }
+      return intoCoordSystem(cm, lineObj, m, context)
+    }
+    var order = getOrder(lineObj, cm.doc.direction), ch = pos.ch, sticky = pos.sticky;
+    if (ch >= lineObj.text.length) {
+      ch = lineObj.text.length;
+      sticky = "before";
+    } else if (ch <= 0) {
+      ch = 0;
+      sticky = "after";
+    }
+    if (!order) { return get(sticky == "before" ? ch - 1 : ch, sticky == "before") }
+
+    function getBidi(ch, partPos, invert) {
+      var part = order[partPos], right = part.level == 1;
+      return get(invert ? ch - 1 : ch, right != invert)
+    }
+    var partPos = getBidiPartAt(order, ch, sticky);
+    var other = bidiOther;
+    var val = getBidi(ch, partPos, sticky == "before");
+    if (other != null) { val.other = getBidi(ch, other, sticky != "before"); }
+    return val
+  }
+
+  // Used to cheaply estimate the coordinates for a position. Used for
+  // intermediate scroll updates.
+  function estimateCoords(cm, pos) {
+    var left = 0;
+    pos = clipPos(cm.doc, pos);
+    if (!cm.options.lineWrapping) { left = charWidth(cm.display) * pos.ch; }
+    var lineObj = getLine(cm.doc, pos.line);
+    var top = heightAtLine(lineObj) + paddingTop(cm.display);
+    return {left: left, right: left, top: top, bottom: top + lineObj.height}
+  }
+
+  // Positions returned by coordsChar contain some extra information.
+  // xRel is the relative x position of the input coordinates compared
+  // to the found position (so xRel > 0 means the coordinates are to
+  // the right of the character position, for example). When outside
+  // is true, that means the coordinates lie outside the line's
+  // vertical range.
+  function PosWithInfo(line, ch, sticky, outside, xRel) {
+    var pos = Pos(line, ch, sticky);
+    pos.xRel = xRel;
+    if (outside) { pos.outside = outside; }
+    return pos
+  }
+
+  // Compute the character position closest to the given coordinates.
+  // Input must be lineSpace-local ("div" coordinate system).
+  function coordsChar(cm, x, y) {
+    var doc = cm.doc;
+    y += cm.display.viewOffset;
+    if (y < 0) { return PosWithInfo(doc.first, 0, null, -1, -1) }
+    var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
+    if (lineN > last)
+      { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1) }
+    if (x < 0) { x = 0; }
+
+    var lineObj = getLine(doc, lineN);
+    for (;;) {
+      var found = coordsCharInner(cm, lineObj, lineN, x, y);
+      var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0));
+      if (!collapsed) { return found }
+      var rangeEnd = collapsed.find(1);
+      if (rangeEnd.line == lineN) { return rangeEnd }
+      lineObj = getLine(doc, lineN = rangeEnd.line);
+    }
+  }
+
+  function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
+    y -= widgetTopHeight(lineObj);
+    var end = lineObj.text.length;
+    var begin = findFirst(function (ch) { return measureCharPrepared(cm, preparedMeasure, ch - 1).bottom <= y; }, end, 0);
+    end = findFirst(function (ch) { return measureCharPrepared(cm, preparedMeasure, ch).top > y; }, begin, end);
+    return {begin: begin, end: end}
+  }
+
+  function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) {
+    if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj); }
+    var targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top;
+    return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop)
+  }
+
+  // Returns true if the given side of a box is after the given
+  // coordinates, in top-to-bottom, left-to-right order.
+  function boxIsAfter(box, x, y, left) {
+    return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x
+  }
+
+  function coordsCharInner(cm, lineObj, lineNo$$1, x, y) {
+    // Move y into line-local coordinate space
+    y -= heightAtLine(lineObj);
+    var preparedMeasure = prepareMeasureForLine(cm, lineObj);
+    // When directly calling `measureCharPrepared`, we have to adjust
+    // for the widgets at this line.
+    var widgetHeight$$1 = widgetTopHeight(lineObj);
+    var begin = 0, end = lineObj.text.length, ltr = true;
+
+    var order = getOrder(lineObj, cm.doc.direction);
+    // If the line isn't plain left-to-right text, first figure out
+    // which bidi section the coordinates fall into.
+    if (order) {
+      var part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart)
+                   (cm, lineObj, lineNo$$1, preparedMeasure, order, x, y);
+      ltr = part.level != 1;
+      // The awkward -1 offsets are needed because findFirst (called
+      // on these below) will treat its first bound as inclusive,
+      // second as exclusive, but we want to actually address the
+      // characters in the part's range
+      begin = ltr ? part.from : part.to - 1;
+      end = ltr ? part.to : part.from - 1;
+    }
+
+    // A binary search to find the first character whose bounding box
+    // starts after the coordinates. If we run across any whose box wrap
+    // the coordinates, store that.
+    var chAround = null, boxAround = null;
+    var ch = findFirst(function (ch) {
+      var box = measureCharPrepared(cm, preparedMeasure, ch);
+      box.top += widgetHeight$$1; box.bottom += widgetHeight$$1;
+      if (!boxIsAfter(box, x, y, false)) { return false }
+      if (box.top <= y && box.left <= x) {
+        chAround = ch;
+        boxAround = box;
+      }
+      return true
+    }, begin, end);
+
+    var baseX, sticky, outside = false;
+    // If a box around the coordinates was found, use that
+    if (boxAround) {
+      // Distinguish coordinates nearer to the left or right side of the box
+      var atLeft = x - boxAround.left < boxAround.right - x, atStart = atLeft == ltr;
+      ch = chAround + (atStart ? 0 : 1);
+      sticky = atStart ? "after" : "before";
+      baseX = atLeft ? boxAround.left : boxAround.right;
+    } else {
+      // (Adjust for extended bound, if necessary.)
+      if (!ltr && (ch == end || ch == begin)) { ch++; }
+      // To determine which side to associate with, get the box to the
+      // left of the character and compare it's vertical position to the
+      // coordinates
+      sticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" :
+        (measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight$$1 <= y) == ltr ?
+        "after" : "before";
+      // Now get accurate coordinates for this place, in order to get a
+      // base X position
+      var coords = cursorCoords(cm, Pos(lineNo$$1, ch, sticky), "line", lineObj, preparedMeasure);
+      baseX = coords.left;
+      outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0;
+    }
+
+    ch = skipExtendingChars(lineObj.text, ch, 1);
+    return PosWithInfo(lineNo$$1, ch, sticky, outside, x - baseX)
+  }
+
+  function coordsBidiPart(cm, lineObj, lineNo$$1, preparedMeasure, order, x, y) {
+    // Bidi parts are sorted left-to-right, and in a non-line-wrapping
+    // situation, we can take this ordering to correspond to the visual
+    // ordering. This finds the first part whose end is after the given
+    // coordinates.
+    var index = findFirst(function (i) {
+      var part = order[i], ltr = part.level != 1;
+      return boxIsAfter(cursorCoords(cm, Pos(lineNo$$1, ltr ? part.to : part.from, ltr ? "before" : "after"),
+                                     "line", lineObj, preparedMeasure), x, y, true)
+    }, 0, order.length - 1);
+    var part = order[index];
+    // If this isn't the first part, the part's start is also after
+    // the coordinates, and the coordinates aren't on the same line as
+    // that start, move one part back.
+    if (index > 0) {
+      var ltr = part.level != 1;
+      var start = cursorCoords(cm, Pos(lineNo$$1, ltr ? part.from : part.to, ltr ? "after" : "before"),
+                               "line", lineObj, preparedMeasure);
+      if (boxIsAfter(start, x, y, true) && start.top > y)
+        { part = order[index - 1]; }
+    }
+    return part
+  }
+
+  function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x, y) {
+    // In a wrapped line, rtl text on wrapping boundaries can do things
+    // that don't correspond to the ordering in our `order` array at
+    // all, so a binary search doesn't work, and we want to return a
+    // part that only spans one line so that the binary search in
+    // coordsCharInner is safe. As such, we first find the extent of the
+    // wrapped line, and then do a flat search in which we discard any
+    // spans that aren't on the line.
+    var ref = wrappedLineExtent(cm, lineObj, preparedMeasure, y);
+    var begin = ref.begin;
+    var end = ref.end;
+    if (/\s/.test(lineObj.text.charAt(end - 1))) { end--; }
+    var part = null, closestDist = null;
+    for (var i = 0; i < order.length; i++) {
+      var p = order[i];
+      if (p.from >= end || p.to <= begin) { continue }
+      var ltr = p.level != 1;
+      var endX = measureCharPrepared(cm, preparedMeasure, ltr ? Math.min(end, p.to) - 1 : Math.max(begin, p.from)).right;
+      // Weigh against spans ending before this, so that they are only
+      // picked if nothing ends after
+      var dist = endX < x ? x - endX + 1e9 : endX - x;
+      if (!part || closestDist > dist) {
+        part = p;
+        closestDist = dist;
+      }
+    }
+    if (!part) { part = order[order.length - 1]; }
+    // Clip the part to the wrapped line.
+    if (part.from < begin) { part = {from: begin, to: part.to, level: part.level}; }
+    if (part.to > end) { part = {from: part.from, to: end, level: part.level}; }
+    return part
+  }
+
+  var measureText;
+  // Compute the default text height.
+  function textHeight(display) {
+    if (display.cachedTextHeight != null) { return display.cachedTextHeight }
+    if (measureText == null) {
+      measureText = elt("pre", null, "CodeMirror-line-like");
+      // Measure a bunch of lines, for browsers that compute
+      // fractional heights.
+      for (var i = 0; i < 49; ++i) {
+        measureText.appendChild(document.createTextNode("x"));
+        measureText.appendChild(elt("br"));
+      }
+      measureText.appendChild(document.createTextNode("x"));
+    }
+    removeChildrenAndAdd(display.measure, measureText);
+    var height = measureText.offsetHeight / 50;
+    if (height > 3) { display.cachedTextHeight = height; }
+    removeChildren(display.measure);
+    return height || 1
+  }
+
+  // Compute the default character width.
+  function charWidth(display) {
+    if (display.cachedCharWidth != null) { return display.cachedCharWidth }
+    var anchor = elt("span", "xxxxxxxxxx");
+    var pre = elt("pre", [anchor], "CodeMirror-line-like");
+    removeChildrenAndAdd(display.measure, pre);
+    var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
+    if (width > 2) { display.cachedCharWidth = width; }
+    return width || 10
+  }
+
+  // Do a bulk-read of the DOM positions and sizes needed to draw the
+  // view, so that we don't interleave reading and writing to the DOM.
+  function getDimensions(cm) {
+    var d = cm.display, left = {}, width = {};
+    var gutterLeft = d.gutters.clientLeft;
+    for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
+      var id = cm.display.gutterSpecs[i].className;
+      left[id] = n.offsetLeft + n.clientLeft + gutterLeft;
+      width[id] = n.clientWidth;
+    }
+    return {fixedPos: compensateForHScroll(d),
+            gutterTotalWidth: d.gutters.offsetWidth,
+            gutterLeft: left,
+            gutterWidth: width,
+            wrapperWidth: d.wrapper.clientWidth}
+  }
+
+  // Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
+  // but using getBoundingClientRect to get a sub-pixel-accurate
+  // result.
+  function compensateForHScroll(display) {
+    return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left
+  }
+
+  // Returns a function that estimates the height of a line, to use as
+  // first approximation until the line becomes visible (and is thus
+  // properly measurable).
+  function estimateHeight(cm) {
+    var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
+    var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
+    return function (line) {
+      if (lineIsHidden(cm.doc, line)) { return 0 }
+
+      var widgetsHeight = 0;
+      if (line.widgets) { for (var i = 0; i < line.widgets.length; i++) {
+        if (line.widgets[i].height) { widgetsHeight += line.widgets[i].height; }
+      } }
+
+      if (wrapping)
+        { return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th }
+      else
+        { return widgetsHeight + th }
+    }
+  }
+
+  function estimateLineHeights(cm) {
+    var doc = cm.doc, est = estimateHeight(cm);
+    doc.iter(function (line) {
+      var estHeight = est(line);
+      if (estHeight != line.height) { updateLineHeight(line, estHeight); }
+    });
+  }
+
+  // Given a mouse event, find the corresponding position. If liberal
+  // is false, it checks whether a gutter or scrollbar was clicked,
+  // and returns null if it was. forRect is used by rectangular
+  // selections, and tries to estimate a character position even for
+  // coordinates beyond the right of the text.
+  function posFromMouse(cm, e, liberal, forRect) {
+    var display = cm.display;
+    if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") { return null }
+
+    var x, y, space = display.lineSpace.getBoundingClientRect();
+    // Fails unpredictably on IE[67] when mouse is dragged around quickly.
+    try { x = e.clientX - space.left; y = e.clientY - space.top; }
+    catch (e) { return null }
+    var coords = coordsChar(cm, x, y), line;
+    if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+      var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
+      coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
+    }
+    return coords
+  }
+
+  // Find the view element corresponding to a given line. Return null
+  // when the line isn't visible.
+  function findViewIndex(cm, n) {
+    if (n >= cm.display.viewTo) { return null }
+    n -= cm.display.viewFrom;
+    if (n < 0) { return null }
+    var view = cm.display.view;
+    for (var i = 0; i < view.length; i++) {
+      n -= view[i].size;
+      if (n < 0) { return i }
+    }
+  }
+
+  // Updates the display.view data structure for a given change to the
+  // document. From and to are in pre-change coordinates. Lendiff is
+  // the amount of lines added or subtracted by the change. This is
+  // used for changes that span multiple lines, or change the way
+  // lines are divided into visual lines. regLineChange (below)
+  // registers single-line changes.
+  function regChange(cm, from, to, lendiff) {
+    if (from == null) { from = cm.doc.first; }
+    if (to == null) { to = cm.doc.first + cm.doc.size; }
+    if (!lendiff) { lendiff = 0; }
+
+    var display = cm.display;
+    if (lendiff && to < display.viewTo &&
+        (display.updateLineNumbers == null || display.updateLineNumbers > from))
+      { display.updateLineNumbers = from; }
+
+    cm.curOp.viewChanged = true;
+
+    if (from >= display.viewTo) { // Change after
+      if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
+        { resetView(cm); }
+    } else if (to <= display.viewFrom) { // Change before
+      if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
+        resetView(cm);
+      } else {
+        display.viewFrom += lendiff;
+        display.viewTo += lendiff;
+      }
+    } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
+      resetView(cm);
+    } else if (from <= display.viewFrom) { // Top overlap
+      var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
+      if (cut) {
+        display.view = display.view.slice(cut.index);
+        display.viewFrom = cut.lineN;
+        display.viewTo += lendiff;
+      } else {
+        resetView(cm);
+      }
+    } else if (to >= display.viewTo) { // Bottom overlap
+      var cut$1 = viewCuttingPoint(cm, from, from, -1);
+      if (cut$1) {
+        display.view = display.view.slice(0, cut$1.index);
+        display.viewTo = cut$1.lineN;
+      } else {
+        resetView(cm);
+      }
+    } else { // Gap in the middle
+      var cutTop = viewCuttingPoint(cm, from, from, -1);
+      var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
+      if (cutTop && cutBot) {
+        display.view = display.view.slice(0, cutTop.index)
+          .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
+          .concat(display.view.slice(cutBot.index));
+        display.viewTo += lendiff;
+      } else {
+        resetView(cm);
+      }
+    }
+
+    var ext = display.externalMeasured;
+    if (ext) {
+      if (to < ext.lineN)
+        { ext.lineN += lendiff; }
+      else if (from < ext.lineN + ext.size)
+        { display.externalMeasured = null; }
+    }
+  }
+
+  // Register a change to a single line. Type must be one of "text",
+  // "gutter", "class", "widget"
+  function regLineChange(cm, line, type) {
+    cm.curOp.viewChanged = true;
+    var display = cm.display, ext = cm.display.externalMeasured;
+    if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
+      { display.externalMeasured = null; }
+
+    if (line < display.viewFrom || line >= display.viewTo) { return }
+    var lineView = display.view[findViewIndex(cm, line)];
+    if (lineView.node == null) { return }
+    var arr = lineView.changes || (lineView.changes = []);
+    if (indexOf(arr, type) == -1) { arr.push(type); }
+  }
+
+  // Clear the view.
+  function resetView(cm) {
+    cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
+    cm.display.view = [];
+    cm.display.viewOffset = 0;
+  }
+
+  function viewCuttingPoint(cm, oldN, newN, dir) {
+    var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
+    if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
+      { return {index: index, lineN: newN} }
+    var n = cm.display.viewFrom;
+    for (var i = 0; i < index; i++)
+      { n += view[i].size; }
+    if (n != oldN) {
+      if (dir > 0) {
+        if (index == view.length - 1) { return null }
+        diff = (n + view[index].size) - oldN;
+        index++;
+      } else {
+        diff = n - oldN;
+      }
+      oldN += diff; newN += diff;
+    }
+    while (visualLineNo(cm.doc, newN) != newN) {
+      if (index == (dir < 0 ? 0 : view.length - 1)) { return null }
+      newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
+      index += dir;
+    }
+    return {index: index, lineN: newN}
+  }
+
+  // Force the view to cover a given range, adding empty view element
+  // or clipping off existing ones as needed.
+  function adjustView(cm, from, to) {
+    var display = cm.display, view = display.view;
+    if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
+      display.view = buildViewArray(cm, from, to);
+      display.viewFrom = from;
+    } else {
+      if (display.viewFrom > from)
+        { display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); }
+      else if (display.viewFrom < from)
+        { display.view = display.view.slice(findViewIndex(cm, from)); }
+      display.viewFrom = from;
+      if (display.viewTo < to)
+        { display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); }
+      else if (display.viewTo > to)
+        { display.view = display.view.slice(0, findViewIndex(cm, to)); }
+    }
+    display.viewTo = to;
+  }
+
+  // Count the number of lines in the view whose DOM representation is
+  // out of date (or nonexistent).
+  function countDirtyView(cm) {
+    var view = cm.display.view, dirty = 0;
+    for (var i = 0; i < view.length; i++) {
+      var lineView = view[i];
+      if (!lineView.hidden && (!lineView.node || lineView.changes)) { ++dirty; }
+    }
+    return dirty
+  }
+
+  function updateSelection(cm) {
+    cm.display.input.showSelection(cm.display.input.prepareSelection());
+  }
+
+  function prepareSelection(cm, primary) {
+    if ( primary === void 0 ) primary = true;
+
+    var doc = cm.doc, result = {};
+    var curFragment = result.cursors = document.createDocumentFragment();
+    var selFragment = result.selection = document.createDocumentFragment();
+
+    for (var i = 0; i < doc.sel.ranges.length; i++) {
+      if (!primary && i == doc.sel.primIndex) { continue }
+      var range$$1 = doc.sel.ranges[i];
+      if (range$$1.from().line >= cm.display.viewTo || range$$1.to().line < cm.display.viewFrom) { continue }
+      var collapsed = range$$1.empty();
+      if (collapsed || cm.options.showCursorWhenSelecting)
+        { drawSelectionCursor(cm, range$$1.head, curFragment); }
+      if (!collapsed)
+        { drawSelectionRange(cm, range$$1, selFragment); }
+    }
+    return result
+  }
+
+  // Draws a cursor for the given range
+  function drawSelectionCursor(cm, head, output) {
+    var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
+
+    var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
+    cursor.style.left = pos.left + "px";
+    cursor.style.top = pos.top + "px";
+    cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
+
+    if (pos.other) {
+      // Secondary cursor, shown when on a 'jump' in bi-directional text
+      var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
+      otherCursor.style.display = "";
+      otherCursor.style.left = pos.other.left + "px";
+      otherCursor.style.top = pos.other.top + "px";
+      otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
+    }
+  }
+
+  function cmpCoords(a, b) { return a.top - b.top || a.left - b.left }
+
+  // Draws the given range as a highlighted selection
+  function drawSelectionRange(cm, range$$1, output) {
+    var display = cm.display, doc = cm.doc;
+    var fragment = document.createDocumentFragment();
+    var padding = paddingH(cm.display), leftSide = padding.left;
+    var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
+    var docLTR = doc.direction == "ltr";
+
+    function add(left, top, width, bottom) {
+      if (top < 0) { top = 0; }
+      top = Math.round(top);
+      bottom = Math.round(bottom);
+      fragment.appendChild(elt("div", null, "CodeMirror-selected", ("position: absolute; left: " + left + "px;\n                             top: " + top + "px; width: " + (width == null ? rightSide - left : width) + "px;\n                             height: " + (bottom - top) + "px")));
+    }
+
+    function drawForLine(line, fromArg, toArg) {
+      var lineObj = getLine(doc, line);
+      var lineLen = lineObj.text.length;
+      var start, end;
+      function coords(ch, bias) {
+        return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
+      }
+
+      function wrapX(pos, dir, side) {
+        var extent = wrappedLineExtentChar(cm, lineObj, null, pos);
+        var prop = (dir == "ltr") == (side == "after") ? "left" : "right";
+        var ch = side == "after" ? extent.begin : extent.end - (/\s/.test(lineObj.text.charAt(extent.end - 1)) ? 2 : 1);
+        return coords(ch, prop)[prop]
+      }
+
+      var order = getOrder(lineObj, doc.direction);
+      iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, function (from, to, dir, i) {
+        var ltr = dir == "ltr";
+        var fromPos = coords(from, ltr ? "left" : "right");
+        var toPos = coords(to - 1, ltr ? "right" : "left");
+
+        var openStart = fromArg == null && from == 0, openEnd = toArg == null && to == lineLen;
+        var first = i == 0, last = !order || i == order.length - 1;
+        if (toPos.top - fromPos.top <= 3) { // Single line
+          var openLeft = (docLTR ? openStart : openEnd) && first;
+          var openRight = (docLTR ? openEnd : openStart) && last;
+          var left = openLeft ? leftSide : (ltr ? fromPos : toPos).left;
+          var right = openRight ? rightSide : (ltr ? toPos : fromPos).right;
+          add(left, fromPos.top, right - left, fromPos.bottom);
+        } else { // Multiple lines
+          var topLeft, topRight, botLeft, botRight;
+          if (ltr) {
+            topLeft = docLTR && openStart && first ? leftSide : fromPos.left;
+            topRight = docLTR ? rightSide : wrapX(from, dir, "before");
+            botLeft = docLTR ? leftSide : wrapX(to, dir, "after");
+            botRight = docLTR && openEnd && last ? rightSide : toPos.right;
+          } else {
+            topLeft = !docLTR ? leftSide : wrapX(from, dir, "before");
+            topRight = !docLTR && openStart && first ? rightSide : fromPos.right;
+            botLeft = !docLTR && openEnd && last ? leftSide : toPos.left;
+            botRight = !docLTR ? rightSide : wrapX(to, dir, "after");
+          }
+          add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom);
+          if (fromPos.bottom < toPos.top) { add(leftSide, fromPos.bottom, null, toPos.top); }
+          add(botLeft, toPos.top, botRight - botLeft, toPos.bottom);
+        }
+
+        if (!start || cmpCoords(fromPos, start) < 0) { start = fromPos; }
+        if (cmpCoords(toPos, start) < 0) { start = toPos; }
+        if (!end || cmpCoords(fromPos, end) < 0) { end = fromPos; }
+        if (cmpCoords(toPos, end) < 0) { end = toPos; }
+      });
+      return {start: start, end: end}
+    }
+
+    var sFrom = range$$1.from(), sTo = range$$1.to();
+    if (sFrom.line == sTo.line) {
+      drawForLine(sFrom.line, sFrom.ch, sTo.ch);
+    } else {
+      var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
+      var singleVLine = visualLine(fromLine) == visualLine(toLine);
+      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
+      var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
+      if (singleVLine) {
+        if (leftEnd.top < rightStart.top - 2) {
+          add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
+          add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
+        } else {
+          add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
+        }
+      }
+      if (leftEnd.bottom < rightStart.top)
+        { add(leftSide, leftEnd.bottom, null, rightStart.top); }
+    }
+
+    output.appendChild(fragment);
+  }
+
+  // Cursor-blinking
+  function restartBlink(cm) {
+    if (!cm.state.focused) { return }
+    var display = cm.display;
+    clearInterval(display.blinker);
+    var on = true;
+    display.cursorDiv.style.visibility = "";
+    if (cm.options.cursorBlinkRate > 0)
+      { display.blinker = setInterval(function () { return display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; },
+        cm.options.cursorBlinkRate); }
+    else if (cm.options.cursorBlinkRate < 0)
+      { display.cursorDiv.style.visibility = "hidden"; }
+  }
+
+  function ensureFocus(cm) {
+    if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
+  }
+
+  function delayBlurEvent(cm) {
+    cm.state.delayingBlurEvent = true;
+    setTimeout(function () { if (cm.state.delayingBlurEvent) {
+      cm.state.delayingBlurEvent = false;
+      onBlur(cm);
+    } }, 100);
+  }
+
+  function onFocus(cm, e) {
+    if (cm.state.delayingBlurEvent) { cm.state.delayingBlurEvent = false; }
+
+    if (cm.options.readOnly == "nocursor") { return }
+    if (!cm.state.focused) {
+      signal(cm, "focus", cm, e);
+      cm.state.focused = true;
+      addClass(cm.display.wrapper, "CodeMirror-focused");
+      // This test prevents this from firing when a context
+      // menu is closed (since the input reset would kill the
+      // select-all detection hack)
+      if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
+        cm.display.input.reset();
+        if (webkit) { setTimeout(function () { return cm.display.input.reset(true); }, 20); } // Issue #1730
+      }
+      cm.display.input.receivedFocus();
+    }
+    restartBlink(cm);
+  }
+  function onBlur(cm, e) {
+    if (cm.state.delayingBlurEvent) { return }
+
+    if (cm.state.focused) {
+      signal(cm, "blur", cm, e);
+      cm.state.focused = false;
+      rmClass(cm.display.wrapper, "CodeMirror-focused");
+    }
+    clearInterval(cm.display.blinker);
+    setTimeout(function () { if (!cm.state.focused) { cm.display.shift = false; } }, 150);
+  }
+
+  // Read the actual heights of the rendered lines, and update their
+  // stored heights to match.
+  function updateHeightsInViewport(cm) {
+    var display = cm.display;
+    var prevBottom = display.lineDiv.offsetTop;
+    for (var i = 0; i < display.view.length; i++) {
+      var cur = display.view[i], wrapping = cm.options.lineWrapping;
+      var height = (void 0), width = 0;
+      if (cur.hidden) { continue }
+      if (ie && ie_version < 8) {
+        var bot = cur.node.offsetTop + cur.node.offsetHeight;
+        height = bot - prevBottom;
+        prevBottom = bot;
+      } else {
+        var box = cur.node.getBoundingClientRect();
+        height = box.bottom - box.top;
+        // Check that lines don't extend past the right of the current
+        // editor width
+        if (!wrapping && cur.text.firstChild)
+          { width = cur.text.firstChild.getBoundingClientRect().right - box.left - 1; }
+      }
+      var diff = cur.line.height - height;
+      if (diff > .005 || diff < -.005) {
+        updateLineHeight(cur.line, height);
+        updateWidgetHeight(cur.line);
+        if (cur.rest) { for (var j = 0; j < cur.rest.length; j++)
+          { updateWidgetHeight(cur.rest[j]); } }
+      }
+      if (width > cm.display.sizerWidth) {
+        var chWidth = Math.ceil(width / charWidth(cm.display));
+        if (chWidth > cm.display.maxLineLength) {
+          cm.display.maxLineLength = chWidth;
+          cm.display.maxLine = cur.line;
+          cm.display.maxLineChanged = true;
+        }
+      }
+    }
+  }
+
+  // Read and store the height of line widgets associated with the
+  // given line.
+  function updateWidgetHeight(line) {
+    if (line.widgets) { for (var i = 0; i < line.widgets.length; ++i) {
+      var w = line.widgets[i], parent = w.node.parentNode;
+      if (parent) { w.height = parent.offsetHeight; }
+    } }
+  }
+
+  // Compute the lines that are visible in a given viewport (defaults
+  // the the current scroll position). viewport may contain top,
+  // height, and ensure (see op.scrollToPos) properties.
+  function visibleLines(display, doc, viewport) {
+    var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
+    top = Math.floor(top - paddingTop(display));
+    var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
+
+    var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
+    // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
+    // forces those lines into the viewport (if possible).
+    if (viewport && viewport.ensure) {
+      var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
+      if (ensureFrom < from) {
+        from = ensureFrom;
+        to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
+      } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
+        from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
+        to = ensureTo;
+      }
+    }
+    return {from: from, to: Math.max(to, from + 1)}
+  }
+
+  // SCROLLING THINGS INTO VIEW
+
+  // If an editor sits on the top or bottom of the window, partially
+  // scrolled out of view, this ensures that the cursor is visible.
+  function maybeScrollWindow(cm, rect) {
+    if (signalDOMEvent(cm, "scrollCursorIntoView")) { return }
+
+    var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
+    if (rect.top + box.top < 0) { doScroll = true; }
+    else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { doScroll = false; }
+    if (doScroll != null && !phantom) {
+      var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n                         top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n                         height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n                         left: " + (rect.left) + "px; width: " + (Math.max(2, rect.right - rect.left)) + "px;"));
+      cm.display.lineSpace.appendChild(scrollNode);
+      scrollNode.scrollIntoView(doScroll);
+      cm.display.lineSpace.removeChild(scrollNode);
+    }
+  }
+
+  // Scroll a given position into view (immediately), verifying that
+  // it actually became visible (as line heights are accurately
+  // measured, the position of something may 'drift' during drawing).
+  function scrollPosIntoView(cm, pos, end, margin) {
+    if (margin == null) { margin = 0; }
+    var rect;
+    if (!cm.options.lineWrapping && pos == end) {
+      // Set pos and end to the cursor positions around the character pos sticks to
+      // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch
+      // If pos == Pos(_, 0, "before"), pos and end are unchanged
+      pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos;
+      end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos;
+    }
+    for (var limit = 0; limit < 5; limit++) {
+      var changed = false;
+      var coords = cursorCoords(cm, pos);
+      var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
+      rect = {left: Math.min(coords.left, endCoords.left),
+              top: Math.min(coords.top, endCoords.top) - margin,
+              right: Math.max(coords.left, endCoords.left),
+              bottom: Math.max(coords.bottom, endCoords.bottom) + margin};
+      var scrollPos = calculateScrollPos(cm, rect);
+      var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
+      if (scrollPos.scrollTop != null) {
+        updateScrollTop(cm, scrollPos.scrollTop);
+        if (Math.abs(cm.doc.scrollTop - startTop) > 1) { changed = true; }
+      }
+      if (scrollPos.scrollLeft != null) {
+        setScrollLeft(cm, scrollPos.scrollLeft);
+        if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { changed = true; }
+      }
+      if (!changed) { break }
+    }
+    return rect
+  }
+
+  // Scroll a given set of coordinates into view (immediately).
+  function scrollIntoView(cm, rect) {
+    var scrollPos = calculateScrollPos(cm, rect);
+    if (scrollPos.scrollTop != null) { updateScrollTop(cm, scrollPos.scrollTop); }
+    if (scrollPos.scrollLeft != null) { setScrollLeft(cm, scrollPos.scrollLeft); }
+  }
+
+  // Calculate a new scroll position needed to scroll the given
+  // rectangle into view. Returns an object with scrollTop and
+  // scrollLeft properties. When these are undefined, the
+  // vertical/horizontal position does not need to be adjusted.
+  function calculateScrollPos(cm, rect) {
+    var display = cm.display, snapMargin = textHeight(cm.display);
+    if (rect.top < 0) { rect.top = 0; }
+    var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
+    var screen = displayHeight(cm), result = {};
+    if (rect.bottom - rect.top > screen) { rect.bottom = rect.top + screen; }
+    var docBottom = cm.doc.height + paddingVert(display);
+    var atTop = rect.top < snapMargin, atBottom = rect.bottom > docBottom - snapMargin;
+    if (rect.top < screentop) {
+      result.scrollTop = atTop ? 0 : rect.top;
+    } else if (rect.bottom > screentop + screen) {
+      var newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen);
+      if (newTop != screentop) { result.scrollTop = newTop; }
+    }
+
+    var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
+    var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
+    var tooWide = rect.right - rect.left > screenw;
+    if (tooWide) { rect.right = rect.left + screenw; }
+    if (rect.left < 10)
+      { result.scrollLeft = 0; }
+    else if (rect.left < screenleft)
+      { result.scrollLeft = Math.max(0, rect.left - (tooWide ? 0 : 10)); }
+    else if (rect.right > screenw + screenleft - 3)
+      { result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; }
+    return result
+  }
+
+  // Store a relative adjustment to the scroll position in the current
+  // operation (to be applied when the operation finishes).
+  function addToScrollTop(cm, top) {
+    if (top == null) { return }
+    resolveScrollToPos(cm);
+    cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
+  }
+
+  // Make sure that at the end of the operation the current cursor is
+  // shown.
+  function ensureCursorVisible(cm) {
+    resolveScrollToPos(cm);
+    var cur = cm.getCursor();
+    cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin};
+  }
+
+  function scrollToCoords(cm, x, y) {
+    if (x != null || y != null) { resolveScrollToPos(cm); }
+    if (x != null) { cm.curOp.scrollLeft = x; }
+    if (y != null) { cm.curOp.scrollTop = y; }
+  }
+
+  function scrollToRange(cm, range$$1) {
+    resolveScrollToPos(cm);
+    cm.curOp.scrollToPos = range$$1;
+  }
+
+  // When an operation has its scrollToPos property set, and another
+  // scroll action is applied before the end of the operation, this
+  // 'simulates' scrolling that position into view in a cheap way, so
+  // that the effect of intermediate scroll commands is not ignored.
+  function resolveScrollToPos(cm) {
+    var range$$1 = cm.curOp.scrollToPos;
+    if (range$$1) {
+      cm.curOp.scrollToPos = null;
+      var from = estimateCoords(cm, range$$1.from), to = estimateCoords(cm, range$$1.to);
+      scrollToCoordsRange(cm, from, to, range$$1.margin);
+    }
+  }
+
+  function scrollToCoordsRange(cm, from, to, margin) {
+    var sPos = calculateScrollPos(cm, {
+      left: Math.min(from.left, to.left),
+      top: Math.min(from.top, to.top) - margin,
+      right: Math.max(from.right, to.right),
+      bottom: Math.max(from.bottom, to.bottom) + margin
+    });
+    scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop);
+  }
+
+  // Sync the scrollable area and scrollbars, ensure the viewport
+  // covers the visible area.
+  function updateScrollTop(cm, val) {
+    if (Math.abs(cm.doc.scrollTop - val) < 2) { return }
+    if (!gecko) { updateDisplaySimple(cm, {top: val}); }
+    setScrollTop(cm, val, true);
+    if (gecko) { updateDisplaySimple(cm); }
+    startWorker(cm, 100);
+  }
+
+  function setScrollTop(cm, val, forceScroll) {
+    val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val);
+    if (cm.display.scroller.scrollTop == val && !forceScroll) { return }
+    cm.doc.scrollTop = val;
+    cm.display.scrollbars.setScrollTop(val);
+    if (cm.display.scroller.scrollTop != val) { cm.display.scroller.scrollTop = val; }
+  }
+
+  // Sync scroller and scrollbar, ensure the gutter elements are
+  // aligned.
+  function setScrollLeft(cm, val, isScroller, forceScroll) {
+    val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
+    if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { return }
+    cm.doc.scrollLeft = val;
+    alignHorizontally(cm);
+    if (cm.display.scroller.scrollLeft != val) { cm.display.scroller.scrollLeft = val; }
+    cm.display.scrollbars.setScrollLeft(val);
+  }
+
+  // SCROLLBARS
+
+  // Prepare DOM reads needed to update the scrollbars. Done in one
+  // shot to minimize update/measure roundtrips.
+  function measureForScrollbars(cm) {
+    var d = cm.display, gutterW = d.gutters.offsetWidth;
+    var docH = Math.round(cm.doc.height + paddingVert(cm.display));
+    return {
+      clientHeight: d.scroller.clientHeight,
+      viewHeight: d.wrapper.clientHeight,
+      scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
+      viewWidth: d.wrapper.clientWidth,
+      barLeft: cm.options.fixedGutter ? gutterW : 0,
+      docHeight: docH,
+      scrollHeight: docH + scrollGap(cm) + d.barHeight,
+      nativeBarWidth: d.nativeBarWidth,
+      gutterWidth: gutterW
+    }
+  }
+
+  var NativeScrollbars = function(place, scroll, cm) {
+    this.cm = cm;
+    var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
+    var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+    vert.tabIndex = horiz.tabIndex = -1;
+    place(vert); place(horiz);
+
+    on(vert, "scroll", function () {
+      if (vert.clientHeight) { scroll(vert.scrollTop, "vertical"); }
+    });
+    on(horiz, "scroll", function () {
+      if (horiz.clientWidth) { scroll(horiz.scrollLeft, "horizontal"); }
+    });
+
+    this.checkedZeroWidth = false;
+    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+    if (ie && ie_version < 8) { this.horiz.style.minHeight = this.vert.style.minWidth = "18px"; }
+  };
+
+  NativeScrollbars.prototype.update = function (measure) {
+    var needsH = measure.scrollWidth > measure.clientWidth + 1;
+    var needsV = measure.scrollHeight > measure.clientHeight + 1;
+    var sWidth = measure.nativeBarWidth;
+
+    if (needsV) {
+      this.vert.style.display = "block";
+      this.vert.style.bottom = needsH ? sWidth + "px" : "0";
+      var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
+      // A bug in IE8 can cause this value to be negative, so guard it.
+      this.vert.firstChild.style.height =
+        Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
+    } else {
+      this.vert.style.display = "";
+      this.vert.firstChild.style.height = "0";
+    }
+
+    if (needsH) {
+      this.horiz.style.display = "block";
+      this.horiz.style.right = needsV ? sWidth + "px" : "0";
+      this.horiz.style.left = measure.barLeft + "px";
+      var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
+      this.horiz.firstChild.style.width =
+        Math.max(0, measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
+    } else {
+      this.horiz.style.display = "";
+      this.horiz.firstChild.style.width = "0";
+    }
+
+    if (!this.checkedZeroWidth && measure.clientHeight > 0) {
+      if (sWidth == 0) { this.zeroWidthHack(); }
+      this.checkedZeroWidth = true;
+    }
+
+    return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0}
+  };
+
+  NativeScrollbars.prototype.setScrollLeft = function (pos) {
+    if (this.horiz.scrollLeft != pos) { this.horiz.scrollLeft = pos; }
+    if (this.disableHoriz) { this.enableZeroWidthBar(this.horiz, this.disableHoriz, "horiz"); }
+  };
+
+  NativeScrollbars.prototype.setScrollTop = function (pos) {
+    if (this.vert.scrollTop != pos) { this.vert.scrollTop = pos; }
+    if (this.disableVert) { this.enableZeroWidthBar(this.vert, this.disableVert, "vert"); }
+  };
+
+  NativeScrollbars.prototype.zeroWidthHack = function () {
+    var w = mac && !mac_geMountainLion ? "12px" : "18px";
+    this.horiz.style.height = this.vert.style.width = w;
+    this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
+    this.disableHoriz = new Delayed;
+    this.disableVert = new Delayed;
+  };
+
+  NativeScrollbars.prototype.enableZeroWidthBar = function (bar, delay, type) {
+    bar.style.pointerEvents = "auto";
+    function maybeDisable() {
+      // To find out whether the scrollbar is still visible, we
+      // check whether the element under the pixel in the bottom
+      // right corner of the scrollbar box is the scrollbar box
+      // itself (when the bar is still visible) or its filler child
+      // (when the bar is hidden). If it is still visible, we keep
+      // it enabled, if it's hidden, we disable pointer events.
+      var box = bar.getBoundingClientRect();
+      var elt$$1 = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2)
+          : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1);
+      if (elt$$1 != bar) { bar.style.pointerEvents = "none"; }
+      else { delay.set(1000, maybeDisable); }
+    }
+    delay.set(1000, maybeDisable);
+  };
+
+  NativeScrollbars.prototype.clear = function () {
+    var parent = this.horiz.parentNode;
+    parent.removeChild(this.horiz);
+    parent.removeChild(this.vert);
+  };
+
+  var NullScrollbars = function () {};
+
+  NullScrollbars.prototype.update = function () { return {bottom: 0, right: 0} };
+  NullScrollbars.prototype.setScrollLeft = function () {};
+  NullScrollbars.prototype.setScrollTop = function () {};
+  NullScrollbars.prototype.clear = function () {};
+
+  function updateScrollbars(cm, measure) {
+    if (!measure) { measure = measureForScrollbars(cm); }
+    var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
+    updateScrollbarsInner(cm, measure);
+    for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
+      if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
+        { updateHeightsInViewport(cm); }
+      updateScrollbarsInner(cm, measureForScrollbars(cm));
+      startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
+    }
+  }
+
+  // Re-synchronize the fake scrollbars with the actual size of the
+  // content.
+  function updateScrollbarsInner(cm, measure) {
+    var d = cm.display;
+    var sizes = d.scrollbars.update(measure);
+
+    d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
+    d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+    d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent";
+
+    if (sizes.right && sizes.bottom) {
+      d.scrollbarFiller.style.display = "block";
+      d.scrollbarFiller.style.height = sizes.bottom + "px";
+      d.scrollbarFiller.style.width = sizes.right + "px";
+    } else { d.scrollbarFiller.style.display = ""; }
+    if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
+      d.gutterFiller.style.display = "block";
+      d.gutterFiller.style.height = sizes.bottom + "px";
+      d.gutterFiller.style.width = measure.gutterWidth + "px";
+    } else { d.gutterFiller.style.display = ""; }
+  }
+
+  var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
+
+  function initScrollbars(cm) {
+    if (cm.display.scrollbars) {
+      cm.display.scrollbars.clear();
+      if (cm.display.scrollbars.addClass)
+        { rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
+    }
+
+    cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) {
+      cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+      // Prevent clicks in the scrollbars from killing focus
+      on(node, "mousedown", function () {
+        if (cm.state.focused) { setTimeout(function () { return cm.display.input.focus(); }, 0); }
+      });
+      node.setAttribute("cm-not-content", "true");
+    }, function (pos, axis) {
+      if (axis == "horizontal") { setScrollLeft(cm, pos); }
+      else { updateScrollTop(cm, pos); }
+    }, cm);
+    if (cm.display.scrollbars.addClass)
+      { addClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
+  }
+
+  // Operations are used to wrap a series of changes to the editor
+  // state in such a way that each change won't have to update the
+  // cursor and display (which would be awkward, slow, and
+  // error-prone). Instead, display updates are batched and then all
+  // combined and executed at once.
+
+  var nextOpId = 0;
+  // Start a new operation.
+  function startOperation(cm) {
+    cm.curOp = {
+      cm: cm,
+      viewChanged: false,      // Flag that indicates that lines might need to be redrawn
+      startHeight: cm.doc.height, // Used to detect need to update scrollbar
+      forceUpdate: false,      // Used to force a redraw
+      updateInput: 0,       // Whether to reset the input textarea
+      typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
+      changeObjs: null,        // Accumulated changes, for firing change events
+      cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
+      cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
+      selectionChanged: false, // Whether the selection needs to be redrawn
+      updateMaxLine: false,    // Set when the widest line needs to be determined anew
+      scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
+      scrollToPos: null,       // Used to scroll to a specific position
+      focus: false,
+      id: ++nextOpId           // Unique ID
+    };
+    pushOperation(cm.curOp);
+  }
+
+  // Finish an operation, updating the display and signalling delayed events
+  function endOperation(cm) {
+    var op = cm.curOp;
+    if (op) { finishOperation(op, function (group) {
+      for (var i = 0; i < group.ops.length; i++)
+        { group.ops[i].cm.curOp = null; }
+      endOperations(group);
+    }); }
+  }
+
+  // The DOM updates done when an operation finishes are batched so
+  // that the minimum number of relayouts are required.
+  function endOperations(group) {
+    var ops = group.ops;
+    for (var i = 0; i < ops.length; i++) // Read DOM
+      { endOperation_R1(ops[i]); }
+    for (var i$1 = 0; i$1 < ops.length; i$1++) // Write DOM (maybe)
+      { endOperation_W1(ops[i$1]); }
+    for (var i$2 = 0; i$2 < ops.length; i$2++) // Read DOM
+      { endOperation_R2(ops[i$2]); }
+    for (var i$3 = 0; i$3 < ops.length; i$3++) // Write DOM (maybe)
+      { endOperation_W2(ops[i$3]); }
+    for (var i$4 = 0; i$4 < ops.length; i$4++) // Read DOM
+      { endOperation_finish(ops[i$4]); }
+  }
+
+  function endOperation_R1(op) {
+    var cm = op.cm, display = cm.display;
+    maybeClipScrollbars(cm);
+    if (op.updateMaxLine) { findMaxLine(cm); }
+
+    op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
+      op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
+                         op.scrollToPos.to.line >= display.viewTo) ||
+      display.maxLineChanged && cm.options.lineWrapping;
+    op.update = op.mustUpdate &&
+      new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+  }
+
+  function endOperation_W1(op) {
+    op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
+  }
+
+  function endOperation_R2(op) {
+    var cm = op.cm, display = cm.display;
+    if (op.updatedDisplay) { updateHeightsInViewport(cm); }
+
+    op.barMeasure = measureForScrollbars(cm);
+
+    // If the max line changed since it was last measured, measure it,
+    // and ensure the document's width matches it.
+    // updateDisplay_W2 will use these properties to do the actual resizing
+    if (display.maxLineChanged && !cm.options.lineWrapping) {
+      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
+      cm.display.sizerWidth = op.adjustWidthTo;
+      op.barMeasure.scrollWidth =
+        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
+      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
+    }
+
+    if (op.updatedDisplay || op.selectionChanged)
+      { op.preparedSelection = display.input.prepareSelection(); }
+  }
+
+  function endOperation_W2(op) {
+    var cm = op.cm;
+
+    if (op.adjustWidthTo != null) {
+      cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
+      if (op.maxScrollLeft < cm.doc.scrollLeft)
+        { setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true); }
+      cm.display.maxLineChanged = false;
+    }
+
+    var takeFocus = op.focus && op.focus == activeElt();
+    if (op.preparedSelection)
+      { cm.display.input.showSelection(op.preparedSelection, takeFocus); }
+    if (op.updatedDisplay || op.startHeight != cm.doc.height)
+      { updateScrollbars(cm, op.barMeasure); }
+    if (op.updatedDisplay)
+      { setDocumentHeight(cm, op.barMeasure); }
+
+    if (op.selectionChanged) { restartBlink(cm); }
+
+    if (cm.state.focused && op.updateInput)
+      { cm.display.input.reset(op.typing); }
+    if (takeFocus) { ensureFocus(op.cm); }
+  }
+
+  function endOperation_finish(op) {
+    var cm = op.cm, display = cm.display, doc = cm.doc;
+
+    if (op.updatedDisplay) { postUpdateDisplay(cm, op.update); }
+
+    // Abort mouse wheel delta measurement, when scrolling explicitly
+    if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
+      { display.wheelStartX = display.wheelStartY = null; }
+
+    // Propagate the scroll position to the actual DOM scroller
+    if (op.scrollTop != null) { setScrollTop(cm, op.scrollTop, op.forceScroll); }
+
+    if (op.scrollLeft != null) { setScrollLeft(cm, op.scrollLeft, true, true); }
+    // If we need to scroll a specific position into view, do so.
+    if (op.scrollToPos) {
+      var rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+                                   clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
+      maybeScrollWindow(cm, rect);
+    }
+
+    // Fire events for markers that are hidden/unidden by editing or
+    // undoing
+    var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
+    if (hidden) { for (var i = 0; i < hidden.length; ++i)
+      { if (!hidden[i].lines.length) { signal(hidden[i], "hide"); } } }
+    if (unhidden) { for (var i$1 = 0; i$1 < unhidden.length; ++i$1)
+      { if (unhidden[i$1].lines.length) { signal(unhidden[i$1], "unhide"); } } }
+
+    if (display.wrapper.offsetHeight)
+      { doc.scrollTop = cm.display.scroller.scrollTop; }
+
+    // Fire change events, and delayed event handlers
+    if (op.changeObjs)
+      { signal(cm, "changes", cm, op.changeObjs); }
+    if (op.update)
+      { op.update.finish(); }
+  }
+
+  // Run the given function in an operation
+  function runInOp(cm, f) {
+    if (cm.curOp) { return f() }
+    startOperation(cm);
+    try { return f() }
+    finally { endOperation(cm); }
+  }
+  // Wraps a function in an operation. Returns the wrapped function.
+  function operation(cm, f) {
+    return function() {
+      if (cm.curOp) { return f.apply(cm, arguments) }
+      startOperation(cm);
+      try { return f.apply(cm, arguments) }
+      finally { endOperation(cm); }
+    }
+  }
+  // Used to add methods to editor and doc instances, wrapping them in
+  // operations.
+  function methodOp(f) {
+    return function() {
+      if (this.curOp) { return f.apply(this, arguments) }
+      startOperation(this);
+      try { return f.apply(this, arguments) }
+      finally { endOperation(this); }
+    }
+  }
+  function docMethodOp(f) {
+    return function() {
+      var cm = this.cm;
+      if (!cm || cm.curOp) { return f.apply(this, arguments) }
+      startOperation(cm);
+      try { return f.apply(this, arguments) }
+      finally { endOperation(cm); }
+    }
+  }
+
+  // HIGHLIGHT WORKER
+
+  function startWorker(cm, time) {
+    if (cm.doc.highlightFrontier < cm.display.viewTo)
+      { cm.state.highlight.set(time, bind(highlightWorker, cm)); }
+  }
+
+  function highlightWorker(cm) {
+    var doc = cm.doc;
+    if (doc.highlightFrontier >= cm.display.viewTo) { return }
+    var end = +new Date + cm.options.workTime;
+    var context = getContextBefore(cm, doc.highlightFrontier);
+    var changedLines = [];
+
+    doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) {
+      if (context.line >= cm.display.viewFrom) { // Visible
+        var oldStyles = line.styles;
+        var resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null;
+        var highlighted = highlightLine(cm, line, context, true);
+        if (resetState) { context.state = resetState; }
+        line.styles = highlighted.styles;
+        var oldCls = line.styleClasses, newCls = highlighted.classes;
+        if (newCls) { line.styleClasses = newCls; }
+        else if (oldCls) { line.styleClasses = null; }
+        var ischange = !oldStyles || oldStyles.length != line.styles.length ||
+          oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
+        for (var i = 0; !ischange && i < oldStyles.length; ++i) { ischange = oldStyles[i] != line.styles[i]; }
+        if (ischange) { changedLines.push(context.line); }
+        line.stateAfter = context.save();
+        context.nextLine();
+      } else {
+        if (line.text.length <= cm.options.maxHighlightLength)
+          { processLine(cm, line.text, context); }
+        line.stateAfter = context.line % 5 == 0 ? context.save() : null;
+        context.nextLine();
+      }
+      if (+new Date > end) {
+        startWorker(cm, cm.options.workDelay);
+        return true
+      }
+    });
+    doc.highlightFrontier = context.line;
+    doc.modeFrontier = Math.max(doc.modeFrontier, context.line);
+    if (changedLines.length) { runInOp(cm, function () {
+      for (var i = 0; i < changedLines.length; i++)
+        { regLineChange(cm, changedLines[i], "text"); }
+    }); }
+  }
+
+  // DISPLAY DRAWING
+
+  var DisplayUpdate = function(cm, viewport, force) {
+    var display = cm.display;
+
+    this.viewport = viewport;
+    // Store some values that we'll need later (but don't want to force a relayout for)
+    this.visible = visibleLines(display, cm.doc, viewport);
+    this.editorIsHidden = !display.wrapper.offsetWidth;
+    this.wrapperHeight = display.wrapper.clientHeight;
+    this.wrapperWidth = display.wrapper.clientWidth;
+    this.oldDisplayWidth = displayWidth(cm);
+    this.force = force;
+    this.dims = getDimensions(cm);
+    this.events = [];
+  };
+
+  DisplayUpdate.prototype.signal = function (emitter, type) {
+    if (hasHandler(emitter, type))
+      { this.events.push(arguments); }
+  };
+  DisplayUpdate.prototype.finish = function () {
+      var this$1 = this;
+
+    for (var i = 0; i < this.events.length; i++)
+      { signal.apply(null, this$1.events[i]); }
+  };
+
+  function maybeClipScrollbars(cm) {
+    var display = cm.display;
+    if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
+      display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
+      display.heightForcer.style.height = scrollGap(cm) + "px";
+      display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
+      display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
+      display.scrollbarsClipped = true;
+    }
+  }
+
+  function selectionSnapshot(cm) {
+    if (cm.hasFocus()) { return null }
+    var active = activeElt();
+    if (!active || !contains(cm.display.lineDiv, active)) { return null }
+    var result = {activeElt: active};
+    if (window.getSelection) {
+      var sel = window.getSelection();
+      if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) {
+        result.anchorNode = sel.anchorNode;
+        result.anchorOffset = sel.anchorOffset;
+        result.focusNode = sel.focusNode;
+        result.focusOffset = sel.focusOffset;
+      }
+    }
+    return result
+  }
+
+  function restoreSelection(snapshot) {
+    if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { return }
+    snapshot.activeElt.focus();
+    if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+      var sel = window.getSelection(), range$$1 = document.createRange();
+      range$$1.setEnd(snapshot.anchorNode, snapshot.anchorOffset);
+      range$$1.collapse(false);
+      sel.removeAllRanges();
+      sel.addRange(range$$1);
+      sel.extend(snapshot.focusNode, snapshot.focusOffset);
+    }
+  }
+
+  // Does the actual updating of the line display. Bails out
+  // (returning false) when there is nothing to be done and forced is
+  // false.
+  function updateDisplayIfNeeded(cm, update) {
+    var display = cm.display, doc = cm.doc;
+
+    if (update.editorIsHidden) {
+      resetView(cm);
+      return false
+    }
+
+    // Bail out if the visible area is already rendered and nothing changed.
+    if (!update.force &&
+        update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
+        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
+        display.renderedView == display.view && countDirtyView(cm) == 0)
+      { return false }
+
+    if (maybeUpdateLineNumberWidth(cm)) {
+      resetView(cm);
+      update.dims = getDimensions(cm);
+    }
+
+    // Compute a suitable new viewport (from & to)
+    var end = doc.first + doc.size;
+    var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
+    var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
+    if (display.viewFrom < from && from - display.viewFrom < 20) { from = Math.max(doc.first, display.viewFrom); }
+    if (display.viewTo > to && display.viewTo - to < 20) { to = Math.min(end, display.viewTo); }
+    if (sawCollapsedSpans) {
+      from = visualLineNo(cm.doc, from);
+      to = visualLineEndNo(cm.doc, to);
+    }
+
+    var different = from != display.viewFrom || to != display.viewTo ||
+      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
+    adjustView(cm, from, to);
+
+    display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
+    // Position the mover div to align with the current scroll position
+    cm.display.mover.style.top = display.viewOffset + "px";
+
+    var toUpdate = countDirtyView(cm);
+    if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
+        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
+      { return false }
+
+    // For big changes, we hide the enclosing element during the
+    // update, since that speeds up the operations on most browsers.
+    var selSnapshot = selectionSnapshot(cm);
+    if (toUpdate > 4) { display.lineDiv.style.display = "none"; }
+    patchDisplay(cm, display.updateLineNumbers, update.dims);
+    if (toUpdate > 4) { display.lineDiv.style.display = ""; }
+    display.renderedView = display.view;
+    // There might have been a widget with a focused element that got
+    // hidden or updated, if so re-focus it.
+    restoreSelection(selSnapshot);
+
+    // Prevent selection and cursors from interfering with the scroll
+    // width and height.
+    removeChildren(display.cursorDiv);
+    removeChildren(display.selectionDiv);
+    display.gutters.style.height = display.sizer.style.minHeight = 0;
+
+    if (different) {
+      display.lastWrapHeight = update.wrapperHeight;
+      display.lastWrapWidth = update.wrapperWidth;
+      startWorker(cm, 400);
+    }
+
+    display.updateLineNumbers = null;
+
+    return true
+  }
+
+  function postUpdateDisplay(cm, update) {
+    var viewport = update.viewport;
+
+    for (var first = true;; first = false) {
+      if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
+        // Clip forced viewport to actual scrollable area.
+        if (viewport && viewport.top != null)
+          { viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)}; }
+        // Updated line heights might result in the drawn area not
+        // actually covering the viewport. Keep looping until it does.
+        update.visible = visibleLines(cm.display, cm.doc, viewport);
+        if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
+          { break }
+      }
+      if (!updateDisplayIfNeeded(cm, update)) { break }
+      updateHeightsInViewport(cm);
+      var barMeasure = measureForScrollbars(cm);
+      updateSelection(cm);
+      updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
+      update.force = false;
+    }
+
+    update.signal(cm, "update", cm);
+    if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
+      update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+      cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
+    }
+  }
+
+  function updateDisplaySimple(cm, viewport) {
+    var update = new DisplayUpdate(cm, viewport);
+    if (updateDisplayIfNeeded(cm, update)) {
+      updateHeightsInViewport(cm);
+      postUpdateDisplay(cm, update);
+      var barMeasure = measureForScrollbars(cm);
+      updateSelection(cm);
+      updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
+      update.finish();
+    }
+  }
+
+  // Sync the actual display DOM structure with display.view, removing
+  // nodes for lines that are no longer in view, and creating the ones
+  // that are not there yet, and updating the ones that are out of
+  // date.
+  function patchDisplay(cm, updateNumbersFrom, dims) {
+    var display = cm.display, lineNumbers = cm.options.lineNumbers;
+    var container = display.lineDiv, cur = container.firstChild;
+
+    function rm(node) {
+      var next = node.nextSibling;
+      // Works around a throw-scroll bug in OS X Webkit
+      if (webkit && mac && cm.display.currentWheelTarget == node)
+        { node.style.display = "none"; }
+      else
+        { node.parentNode.removeChild(node); }
+      return next
+    }
+
+    var view = display.view, lineN = display.viewFrom;
+    // Loop over the elements in the view, syncing cur (the DOM nodes
+    // in display.lineDiv) with the view as we go.
+    for (var i = 0; i < view.length; i++) {
+      var lineView = view[i];
+      if (lineView.hidden) ; else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
+        var node = buildLineElement(cm, lineView, lineN, dims);
+        container.insertBefore(node, cur);
+      } else { // Already drawn
+        while (cur != lineView.node) { cur = rm(cur); }
+        var updateNumber = lineNumbers && updateNumbersFrom != null &&
+          updateNumbersFrom <= lineN && lineView.lineNumber;
+        if (lineView.changes) {
+          if (indexOf(lineView.changes, "gutter") > -1) { updateNumber = false; }
+          updateLineForChanges(cm, lineView, lineN, dims);
+        }
+        if (updateNumber) {
+          removeChildren(lineView.lineNumber);
+          lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
+        }
+        cur = lineView.node.nextSibling;
+      }
+      lineN += lineView.size;
+    }
+    while (cur) { cur = rm(cur); }
+  }
+
+  function updateGutterSpace(display) {
+    var width = display.gutters.offsetWidth;
+    display.sizer.style.marginLeft = width + "px";
+  }
+
+  function setDocumentHeight(cm, measure) {
+    cm.display.sizer.style.minHeight = measure.docHeight + "px";
+    cm.display.heightForcer.style.top = measure.docHeight + "px";
+    cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
+  }
+
+  // Re-align line numbers and gutter marks to compensate for
+  // horizontal scrolling.
+  function alignHorizontally(cm) {
+    var display = cm.display, view = display.view;
+    if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }
+    var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
+    var gutterW = display.gutters.offsetWidth, left = comp + "px";
+    for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {
+      if (cm.options.fixedGutter) {
+        if (view[i].gutter)
+          { view[i].gutter.style.left = left; }
+        if (view[i].gutterBackground)
+          { view[i].gutterBackground.style.left = left; }
+      }
+      var align = view[i].alignable;
+      if (align) { for (var j = 0; j < align.length; j++)
+        { align[j].style.left = left; } }
+    } }
+    if (cm.options.fixedGutter)
+      { display.gutters.style.left = (comp + gutterW) + "px"; }
+  }
+
+  // Used to ensure that the line number gutter is still the right
+  // size for the current document size. Returns true when an update
+  // is needed.
+  function maybeUpdateLineNumberWidth(cm) {
+    if (!cm.options.lineNumbers) { return false }
+    var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
+    if (last.length != display.lineNumChars) {
+      var test = display.measure.appendChild(elt("div", [elt("div", last)],
+                                                 "CodeMirror-linenumber CodeMirror-gutter-elt"));
+      var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
+      display.lineGutter.style.width = "";
+      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
+      display.lineNumWidth = display.lineNumInnerWidth + padding;
+      display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
+      display.lineGutter.style.width = display.lineNumWidth + "px";
+      updateGutterSpace(cm.display);
+      return true
+    }
+    return false
+  }
+
+  function getGutters(gutters, lineNumbers) {
+    var result = [], sawLineNumbers = false;
+    for (var i = 0; i < gutters.length; i++) {
+      var name = gutters[i], style = null;
+      if (typeof name != "string") { style = name.style; name = name.className; }
+      if (name == "CodeMirror-linenumbers") {
+        if (!lineNumbers) { continue }
+        else { sawLineNumbers = true; }
+      }
+      result.push({className: name, style: style});
+    }
+    if (lineNumbers && !sawLineNumbers) { result.push({className: "CodeMirror-linenumbers", style: null}); }
+    return result
+  }
+
+  // Rebuild the gutter elements, ensure the margin to the left of the
+  // code matches their width.
+  function renderGutters(display) {
+    var gutters = display.gutters, specs = display.gutterSpecs;
+    removeChildren(gutters);
+    display.lineGutter = null;
+    for (var i = 0; i < specs.length; ++i) {
+      var ref = specs[i];
+      var className = ref.className;
+      var style = ref.style;
+      var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + className));
+      if (style) { gElt.style.cssText = style; }
+      if (className == "CodeMirror-linenumbers") {
+        display.lineGutter = gElt;
+        gElt.style.width = (display.lineNumWidth || 1) + "px";
+      }
+    }
+    gutters.style.display = specs.length ? "" : "none";
+    updateGutterSpace(display);
+  }
+
+  function updateGutters(cm) {
+    renderGutters(cm.display);
+    regChange(cm);
+    alignHorizontally(cm);
+  }
+
+  // The display handles the DOM integration, both for input reading
+  // and content drawing. It holds references to DOM nodes and
+  // display-related state.
+
+  function Display(place, doc, input, options) {
+    var d = this;
+    this.input = input;
+
+    // Covers bottom-right square when both scrollbars are present.
+    d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
+    d.scrollbarFiller.setAttribute("cm-not-content", "true");
+    // Covers bottom of gutter when coverGutterNextToScrollbar is on
+    // and h scrollbar is present.
+    d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
+    d.gutterFiller.setAttribute("cm-not-content", "true");
+    // Will contain the actual code, positioned to cover the viewport.
+    d.lineDiv = eltP("div", null, "CodeMirror-code");
+    // Elements are added to these to represent selection and cursors.
+    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
+    d.cursorDiv = elt("div", null, "CodeMirror-cursors");
+    // A visibility: hidden element used to find the size of things.
+    d.measure = elt("div", null, "CodeMirror-measure");
+    // When lines outside of the viewport are measured, they are drawn in this.
+    d.lineMeasure = elt("div", null, "CodeMirror-measure");
+    // Wraps everything that needs to exist inside the vertically-padded coordinate system
+    d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
+                      null, "position: relative; outline: none");
+    var lines = eltP("div", [d.lineSpace], "CodeMirror-lines");
+    // Moved around its parent to cover visible view.
+    d.mover = elt("div", [lines], null, "position: relative");
+    // Set to the height of the document, allowing scrolling.
+    d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
+    d.sizerWidth = null;
+    // Behavior of elts with overflow: auto and padding is
+    // inconsistent across browsers. This is used to ensure the
+    // scrollable area is big enough.
+    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
+    // Will contain the gutters, if any.
+    d.gutters = elt("div", null, "CodeMirror-gutters");
+    d.lineGutter = null;
+    // Actual scrollable element.
+    d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
+    d.scroller.setAttribute("tabIndex", "-1");
+    // The element in which the editor lives.
+    d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+
+    // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
+    if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
+    if (!webkit && !(gecko && mobile)) { d.scroller.draggable = true; }
+
+    if (place) {
+      if (place.appendChild) { place.appendChild(d.wrapper); }
+      else { place(d.wrapper); }
+    }
+
+    // Current rendered range (may be bigger than the view window).
+    d.viewFrom = d.viewTo = doc.first;
+    d.reportedViewFrom = d.reportedViewTo = doc.first;
+    // Information about the rendered lines.
+    d.view = [];
+    d.renderedView = null;
+    // Holds info about a single rendered line when it was rendered
+    // for measurement, while not in view.
+    d.externalMeasured = null;
+    // Empty space (in pixels) above the view
+    d.viewOffset = 0;
+    d.lastWrapHeight = d.lastWrapWidth = 0;
+    d.updateLineNumbers = null;
+
+    d.nativeBarWidth = d.barHeight = d.barWidth = 0;
+    d.scrollbarsClipped = false;
+
+    // Used to only resize the line number gutter when necessary (when
+    // the amount of lines crosses a boundary that makes its width change)
+    d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
+    // Set to true when a non-horizontal-scrolling line widget is
+    // added. As an optimization, line widget aligning is skipped when
+    // this is false.
+    d.alignWidgets = false;
+
+    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+
+    // Tracks the maximum line length so that the horizontal scrollbar
+    // can be kept static when scrolling.
+    d.maxLine = null;
+    d.maxLineLength = 0;
+    d.maxLineChanged = false;
+
+    // Used for measuring wheel scrolling granularity
+    d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
+
+    // True when shift is held down.
+    d.shift = false;
+
+    // Used to track whether anything happened since the context menu
+    // was opened.
+    d.selForContextMenu = null;
+
+    d.activeTouch = null;
+
+    d.gutterSpecs = getGutters(options.gutters, options.lineNumbers);
+    renderGutters(d);
+
+    input.init(d);
+  }
+
+  // Since the delta values reported on mouse wheel events are
+  // unstandardized between browsers and even browser versions, and
+  // generally horribly unpredictable, this code starts by measuring
+  // the scroll effect that the first few mouse wheel events have,
+  // and, from that, detects the way it can convert deltas to pixel
+  // offsets afterwards.
+  //
+  // The reason we want to know the amount a wheel event will scroll
+  // is that it gives us a chance to update the display before the
+  // actual scrolling happens, reducing flickering.
+
+  var wheelSamples = 0, wheelPixelsPerUnit = null;
+  // Fill in a browser-detected starting value on browsers where we
+  // know one. These don't have to be accurate -- the result of them
+  // being wrong would just be a slight flicker on the first wheel
+  // scroll (if it is large enough).
+  if (ie) { wheelPixelsPerUnit = -.53; }
+  else if (gecko) { wheelPixelsPerUnit = 15; }
+  else if (chrome) { wheelPixelsPerUnit = -.7; }
+  else if (safari) { wheelPixelsPerUnit = -1/3; }
+
+  function wheelEventDelta(e) {
+    var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
+    if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { dx = e.detail; }
+    if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { dy = e.detail; }
+    else if (dy == null) { dy = e.wheelDelta; }
+    return {x: dx, y: dy}
+  }
+  function wheelEventPixels(e) {
+    var delta = wheelEventDelta(e);
+    delta.x *= wheelPixelsPerUnit;
+    delta.y *= wheelPixelsPerUnit;
+    return delta
+  }
+
+  function onScrollWheel(cm, e) {
+    var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
+
+    var display = cm.display, scroll = display.scroller;
+    // Quit if there's nothing to scroll here
+    var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+    var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+    if (!(dx && canScrollX || dy && canScrollY)) { return }
+
+    // Webkit browsers on OS X abort momentum scrolls when the target
+    // of the scroll event is removed from the scrollable element.
+    // This hack (see related code in patchDisplay) makes sure the
+    // element is kept around.
+    if (dy && mac && webkit) {
+      outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
+        for (var i = 0; i < view.length; i++) {
+          if (view[i].node == cur) {
+            cm.display.currentWheelTarget = cur;
+            break outer
+          }
+        }
+      }
+    }
+
+    // On some browsers, horizontal scrolling will cause redraws to
+    // happen before the gutter has been realigned, causing it to
+    // wriggle around in a most unseemly way. When we have an
+    // estimated pixels/delta value, we just handle horizontal
+    // scrolling entirely here. It'll be slightly off from native, but
+    // better than glitching out.
+    if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
+      if (dy && canScrollY)
+        { updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit)); }
+      setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * wheelPixelsPerUnit));
+      // Only prevent default scrolling if vertical scrolling is
+      // actually possible. Otherwise, it causes vertical scroll
+      // jitter on OSX trackpads when deltaX is small and deltaY
+      // is large (issue #3579)
+      if (!dy || (dy && canScrollY))
+        { e_preventDefault(e); }
+      display.wheelStartX = null; // Abort measurement, if in progress
+      return
+    }
+
+    // 'Project' the visible viewport to cover the area that is being
+    // scrolled into view (if we know enough to estimate it).
+    if (dy && wheelPixelsPerUnit != null) {
+      var pixels = dy * wheelPixelsPerUnit;
+      var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
+      if (pixels < 0) { top = Math.max(0, top + pixels - 50); }
+      else { bot = Math.min(cm.doc.height, bot + pixels + 50); }
+      updateDisplaySimple(cm, {top: top, bottom: bot});
+    }
+
+    if (wheelSamples < 20) {
+      if (display.wheelStartX == null) {
+        display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
+        display.wheelDX = dx; display.wheelDY = dy;
+        setTimeout(function () {
+          if (display.wheelStartX == null) { return }
+          var movedX = scroll.scrollLeft - display.wheelStartX;
+          var movedY = scroll.scrollTop - display.wheelStartY;
+          var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
+            (movedX && display.wheelDX && movedX / display.wheelDX);
+          display.wheelStartX = display.wheelStartY = null;
+          if (!sample) { return }
+          wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
+          ++wheelSamples;
+        }, 200);
+      } else {
+        display.wheelDX += dx; display.wheelDY += dy;
+      }
+    }
+  }
+
+  // Selection objects are immutable. A new one is created every time
+  // the selection changes. A selection is one or more non-overlapping
+  // (and non-touching) ranges, sorted, and an integer that indicates
+  // which one is the primary selection (the one that's scrolled into
+  // view, that getCursor returns, etc).
+  var Selection = function(ranges, primIndex) {
+    this.ranges = ranges;
+    this.primIndex = primIndex;
+  };
+
+  Selection.prototype.primary = function () { return this.ranges[this.primIndex] };
+
+  Selection.prototype.equals = function (other) {
+      var this$1 = this;
+
+    if (other == this) { return true }
+    if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { return false }
+    for (var i = 0; i < this.ranges.length; i++) {
+      var here = this$1.ranges[i], there = other.ranges[i];
+      if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) { return false }
+    }
+    return true
+  };
+
+  Selection.prototype.deepCopy = function () {
+      var this$1 = this;
+
+    var out = [];
+    for (var i = 0; i < this.ranges.length; i++)
+      { out[i] = new Range(copyPos(this$1.ranges[i].anchor), copyPos(this$1.ranges[i].head)); }
+    return new Selection(out, this.primIndex)
+  };
+
+  Selection.prototype.somethingSelected = function () {
+      var this$1 = this;
+
+    for (var i = 0; i < this.ranges.length; i++)
+      { if (!this$1.ranges[i].empty()) { return true } }
+    return false
+  };
+
+  Selection.prototype.contains = function (pos, end) {
+      var this$1 = this;
+
+    if (!end) { end = pos; }
+    for (var i = 0; i < this.ranges.length; i++) {
+      var range = this$1.ranges[i];
+      if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
+        { return i }
+    }
+    return -1
+  };
+
+  var Range = function(anchor, head) {
+    this.anchor = anchor; this.head = head;
+  };
+
+  Range.prototype.from = function () { return minPos(this.anchor, this.head) };
+  Range.prototype.to = function () { return maxPos(this.anchor, this.head) };
+  Range.prototype.empty = function () { return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch };
+
+  // Take an unsorted, potentially overlapping set of ranges, and
+  // build a selection out of it. 'Consumes' ranges array (modifying
+  // it).
+  function normalizeSelection(cm, ranges, primIndex) {
+    var mayTouch = cm && cm.options.selectionsMayTouch;
+    var prim = ranges[primIndex];
+    ranges.sort(function (a, b) { return cmp(a.from(), b.from()); });
+    primIndex = indexOf(ranges, prim);
+    for (var i = 1; i < ranges.length; i++) {
+      var cur = ranges[i], prev = ranges[i - 1];
+      var diff = cmp(prev.to(), cur.from());
+      if (mayTouch && !cur.empty() ? diff > 0 : diff >= 0) {
+        var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
+        var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
+        if (i <= primIndex) { --primIndex; }
+        ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
+      }
+    }
+    return new Selection(ranges, primIndex)
+  }
+
+  function simpleSelection(anchor, head) {
+    return new Selection([new Range(anchor, head || anchor)], 0)
+  }
+
+  // Compute the position of the end of a change (its 'to' property
+  // refers to the pre-change end).
+  function changeEnd(change) {
+    if (!change.text) { return change.to }
+    return Pos(change.from.line + change.text.length - 1,
+               lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0))
+  }
+
+  // Adjust a position to refer to the post-change position of the
+  // same text, or the end of the change if the change covers it.
+  function adjustForChange(pos, change) {
+    if (cmp(pos, change.from) < 0) { return pos }
+    if (cmp(pos, change.to) <= 0) { return changeEnd(change) }
+
+    var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
+    if (pos.line == change.to.line) { ch += changeEnd(change).ch - change.to.ch; }
+    return Pos(line, ch)
+  }
+
+  function computeSelAfterChange(doc, change) {
+    var out = [];
+    for (var i = 0; i < doc.sel.ranges.length; i++) {
+      var range = doc.sel.ranges[i];
+      out.push(new Range(adjustForChange(range.anchor, change),
+                         adjustForChange(range.head, change)));
+    }
+    return normalizeSelection(doc.cm, out, doc.sel.primIndex)
+  }
+
+  function offsetPos(pos, old, nw) {
+    if (pos.line == old.line)
+      { return Pos(nw.line, pos.ch - old.ch + nw.ch) }
+    else
+      { return Pos(nw.line + (pos.line - old.line), pos.ch) }
+  }
+
+  // Used by replaceSelections to allow moving the selection to the
+  // start or around the replaced test. Hint may be "start" or "around".
+  function computeReplacedSel(doc, changes, hint) {
+    var out = [];
+    var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
+    for (var i = 0; i < changes.length; i++) {
+      var change = changes[i];
+      var from = offsetPos(change.from, oldPrev, newPrev);
+      var to = offsetPos(changeEnd(change), oldPrev, newPrev);
+      oldPrev = change.to;
+      newPrev = to;
+      if (hint == "around") {
+        var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
+        out[i] = new Range(inv ? to : from, inv ? from : to);
+      } else {
+        out[i] = new Range(from, from);
+      }
+    }
+    return new Selection(out, doc.sel.primIndex)
+  }
+
+  // Used to get the editor into a consistent state again when options change.
+
+  function loadMode(cm) {
+    cm.doc.mode = getMode(cm.options, cm.doc.modeOption);
+    resetModeState(cm);
+  }
+
+  function resetModeState(cm) {
+    cm.doc.iter(function (line) {
+      if (line.stateAfter) { line.stateAfter = null; }
+      if (line.styles) { line.styles = null; }
+    });
+    cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first;
+    startWorker(cm, 100);
+    cm.state.modeGen++;
+    if (cm.curOp) { regChange(cm); }
+  }
+
+  // DOCUMENT DATA STRUCTURE
+
+  // By default, updates that start and end at the beginning of a line
+  // are treated specially, in order to make the association of line
+  // widgets and marker elements with the text behave more intuitive.
+  function isWholeLineUpdate(doc, change) {
+    return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
+      (!doc.cm || doc.cm.options.wholeLineUpdateBefore)
+  }
+
+  // Perform a change on the document data structure.
+  function updateDoc(doc, change, markedSpans, estimateHeight$$1) {
+    function spansFor(n) {return markedSpans ? markedSpans[n] : null}
+    function update(line, text, spans) {
+      updateLine(line, text, spans, estimateHeight$$1);
+      signalLater(line, "change", line, change);
+    }
+    function linesFor(start, end) {
+      var result = [];
+      for (var i = start; i < end; ++i)
+        { result.push(new Line(text[i], spansFor(i), estimateHeight$$1)); }
+      return result
+    }
+
+    var from = change.from, to = change.to, text = change.text;
+    var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
+    var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
+
+    // Adjust the line structure
+    if (change.full) {
+      doc.insert(0, linesFor(0, text.length));
+      doc.remove(text.length, doc.size - text.length);
+    } else if (isWholeLineUpdate(doc, change)) {
+      // This is a whole-line replace. Treated specially to make
+      // sure line objects move the way they are supposed to.
+      var added = linesFor(0, text.length - 1);
+      update(lastLine, lastLine.text, lastSpans);
+      if (nlines) { doc.remove(from.line, nlines); }
+      if (added.length) { doc.insert(from.line, added); }
+    } else if (firstLine == lastLine) {
+      if (text.length == 1) {
+        update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
+      } else {
+        var added$1 = linesFor(1, text.length - 1);
+        added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight$$1));
+        update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
+        doc.insert(from.line + 1, added$1);
+      }
+    } else if (text.length == 1) {
+      update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
+      doc.remove(from.line + 1, nlines);
+    } else {
+      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
+      update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
+      var added$2 = linesFor(1, text.length - 1);
+      if (nlines > 1) { doc.remove(from.line + 1, nlines - 1); }
+      doc.insert(from.line + 1, added$2);
+    }
+
+    signalLater(doc, "change", doc, change);
+  }
+
+  // Call f for all linked documents.
+  function linkedDocs(doc, f, sharedHistOnly) {
+    function propagate(doc, skip, sharedHist) {
+      if (doc.linked) { for (var i = 0; i < doc.linked.length; ++i) {
+        var rel = doc.linked[i];
+        if (rel.doc == skip) { continue }
+        var shared = sharedHist && rel.sharedHist;
+        if (sharedHistOnly && !shared) { continue }
+        f(rel.doc, shared);
+        propagate(rel.doc, doc, shared);
+      } }
+    }
+    propagate(doc, null, true);
+  }
+
+  // Attach a document to an editor.
+  function attachDoc(cm, doc) {
+    if (doc.cm) { throw new Error("This document is already in use.") }
+    cm.doc = doc;
+    doc.cm = cm;
+    estimateLineHeights(cm);
+    loadMode(cm);
+    setDirectionClass(cm);
+    if (!cm.options.lineWrapping) { findMaxLine(cm); }
+    cm.options.mode = doc.modeOption;
+    regChange(cm);
+  }
+
+  function setDirectionClass(cm) {
+  (cm.doc.direction == "rtl" ? addClass : rmClass)(cm.display.lineDiv, "CodeMirror-rtl");
+  }
+
+  function directionChanged(cm) {
+    runInOp(cm, function () {
+      setDirectionClass(cm);
+      regChange(cm);
+    });
+  }
+
+  function History(startGen) {
+    // Arrays of change events and selections. Doing something adds an
+    // event to done and clears undo. Undoing moves events from done
+    // to undone, redoing moves them in the other direction.
+    this.done = []; this.undone = [];
+    this.undoDepth = Infinity;
+    // Used to track when changes can be merged into a single undo
+    // event
+    this.lastModTime = this.lastSelTime = 0;
+    this.lastOp = this.lastSelOp = null;
+    this.lastOrigin = this.lastSelOrigin = null;
+    // Used by the isClean() method
+    this.generation = this.maxGeneration = startGen || 1;
+  }
+
+  // Create a history change event from an updateDoc-style change
+  // object.
+  function historyChangeFromChange(doc, change) {
+    var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
+    attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
+    linkedDocs(doc, function (doc) { return attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); }, true);
+    return histChange
+  }
+
+  // Pop all selection events off the end of a history array. Stop at
+  // a change event.
+  function clearSelectionEvents(array) {
+    while (array.length) {
+      var last = lst(array);
+      if (last.ranges) { array.pop(); }
+      else { break }
+    }
+  }
+
+  // Find the top change event in the history. Pop off selection
+  // events that are in the way.
+  function lastChangeEvent(hist, force) {
+    if (force) {
+      clearSelectionEvents(hist.done);
+      return lst(hist.done)
+    } else if (hist.done.length && !lst(hist.done).ranges) {
+      return lst(hist.done)
+    } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
+      hist.done.pop();
+      return lst(hist.done)
+    }
+  }
+
+  // Register a change in the history. Merges changes that are within
+  // a single operation, or are close together with an origin that
+  // allows merging (starting with "+") into a single event.
+  function addChangeToHistory(doc, change, selAfter, opId) {
+    var hist = doc.history;
+    hist.undone.length = 0;
+    var time = +new Date, cur;
+    var last;
+
+    if ((hist.lastOp == opId ||
+         hist.lastOrigin == change.origin && change.origin &&
+         ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) ||
+          change.origin.charAt(0) == "*")) &&
+        (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
+      // Merge this change into the last event
+      last = lst(cur.changes);
+      if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
+        // Optimized case for simple insertion -- don't want to add
+        // new changesets for every character typed
+        last.to = changeEnd(change);
+      } else {
+        // Add new sub-event
+        cur.changes.push(historyChangeFromChange(doc, change));
+      }
+    } else {
+      // Can not be merged, start a new event.
+      var before = lst(hist.done);
+      if (!before || !before.ranges)
+        { pushSelectionToHistory(doc.sel, hist.done); }
+      cur = {changes: [historyChangeFromChange(doc, change)],
+             generation: hist.generation};
+      hist.done.push(cur);
+      while (hist.done.length > hist.undoDepth) {
+        hist.done.shift();
+        if (!hist.done[0].ranges) { hist.done.shift(); }
+      }
+    }
+    hist.done.push(selAfter);
+    hist.generation = ++hist.maxGeneration;
+    hist.lastModTime = hist.lastSelTime = time;
+    hist.lastOp = hist.lastSelOp = opId;
+    hist.lastOrigin = hist.lastSelOrigin = change.origin;
+
+    if (!last) { signal(doc, "historyAdded"); }
+  }
+
+  function selectionEventCanBeMerged(doc, origin, prev, sel) {
+    var ch = origin.charAt(0);
+    return ch == "*" ||
+      ch == "+" &&
+      prev.ranges.length == sel.ranges.length &&
+      prev.somethingSelected() == sel.somethingSelected() &&
+      new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500)
+  }
+
+  // Called whenever the selection changes, sets the new selection as
+  // the pending selection in the history, and pushes the old pending
+  // selection into the 'done' array when it was significantly
+  // different (in number of selected ranges, emptiness, or time).
+  function addSelectionToHistory(doc, sel, opId, options) {
+    var hist = doc.history, origin = options && options.origin;
+
+    // A new event is started when the previous origin does not match
+    // the current, or the origins don't allow matching. Origins
+    // starting with * are always merged, those starting with + are
+    // merged when similar and close together in time.
+    if (opId == hist.lastSelOp ||
+        (origin && hist.lastSelOrigin == origin &&
+         (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
+          selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
+      { hist.done[hist.done.length - 1] = sel; }
+    else
+      { pushSelectionToHistory(sel, hist.done); }
+
+    hist.lastSelTime = +new Date;
+    hist.lastSelOrigin = origin;
+    hist.lastSelOp = opId;
+    if (options && options.clearRedo !== false)
+      { clearSelectionEvents(hist.undone); }
+  }
+
+  function pushSelectionToHistory(sel, dest) {
+    var top = lst(dest);
+    if (!(top && top.ranges && top.equals(sel)))
+      { dest.push(sel); }
+  }
+
+  // Used to store marked span information in the history.
+  function attachLocalSpans(doc, change, from, to) {
+    var existing = change["spans_" + doc.id], n = 0;
+    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function (line) {
+      if (line.markedSpans)
+        { (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans; }
+      ++n;
+    });
+  }
+
+  // When un/re-doing restores text containing marked spans, those
+  // that have been explicitly cleared should not be restored.
+  function removeClearedSpans(spans) {
+    if (!spans) { return null }
+    var out;
+    for (var i = 0; i < spans.length; ++i) {
+      if (spans[i].marker.explicitlyCleared) { if (!out) { out = spans.slice(0, i); } }
+      else if (out) { out.push(spans[i]); }
+    }
+    return !out ? spans : out.length ? out : null
+  }
+
+  // Retrieve and filter the old marked spans stored in a change event.
+  function getOldSpans(doc, change) {
+    var found = change["spans_" + doc.id];
+    if (!found) { return null }
+    var nw = [];
+    for (var i = 0; i < change.text.length; ++i)
+      { nw.push(removeClearedSpans(found[i])); }
+    return nw
+  }
+
+  // Used for un/re-doing changes from the history. Combines the
+  // result of computing the existing spans with the set of spans that
+  // existed in the history (so that deleting around a span and then
+  // undoing brings back the span).
+  function mergeOldSpans(doc, change) {
+    var old = getOldSpans(doc, change);
+    var stretched = stretchSpansOverChange(doc, change);
+    if (!old) { return stretched }
+    if (!stretched) { return old }
+
+    for (var i = 0; i < old.length; ++i) {
+      var oldCur = old[i], stretchCur = stretched[i];
+      if (oldCur && stretchCur) {
+        spans: for (var j = 0; j < stretchCur.length; ++j) {
+          var span = stretchCur[j];
+          for (var k = 0; k < oldCur.length; ++k)
+            { if (oldCur[k].marker == span.marker) { continue spans } }
+          oldCur.push(span);
+        }
+      } else if (stretchCur) {
+        old[i] = stretchCur;
+      }
+    }
+    return old
+  }
+
+  // Used both to provide a JSON-safe object in .getHistory, and, when
+  // detaching a document, to split the history in two
+  function copyHistoryArray(events, newGroup, instantiateSel) {
+    var copy = [];
+    for (var i = 0; i < events.length; ++i) {
+      var event = events[i];
+      if (event.ranges) {
+        copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
+        continue
+      }
+      var changes = event.changes, newChanges = [];
+      copy.push({changes: newChanges});
+      for (var j = 0; j < changes.length; ++j) {
+        var change = changes[j], m = (void 0);
+        newChanges.push({from: change.from, to: change.to, text: change.text});
+        if (newGroup) { for (var prop in change) { if (m = prop.match(/^spans_(\d+)$/)) {
+          if (indexOf(newGroup, Number(m[1])) > -1) {
+            lst(newChanges)[prop] = change[prop];
+            delete change[prop];
+          }
+        } } }
+      }
+    }
+    return copy
+  }
+
+  // The 'scroll' parameter given to many of these indicated whether
+  // the new cursor position should be scrolled into view after
+  // modifying the selection.
+
+  // If shift is held or the extend flag is set, extends a range to
+  // include a given position (and optionally a second position).
+  // Otherwise, simply returns the range between the given positions.
+  // Used for cursor motion and such.
+  function extendRange(range, head, other, extend) {
+    if (extend) {
+      var anchor = range.anchor;
+      if (other) {
+        var posBefore = cmp(head, anchor) < 0;
+        if (posBefore != (cmp(other, anchor) < 0)) {
+          anchor = head;
+          head = other;
+        } else if (posBefore != (cmp(head, other) < 0)) {
+          head = other;
+        }
+      }
+      return new Range(anchor, head)
+    } else {
+      return new Range(other || head, head)
+    }
+  }
+
+  // Extend the primary selection range, discard the rest.
+  function extendSelection(doc, head, other, options, extend) {
+    if (extend == null) { extend = doc.cm && (doc.cm.display.shift || doc.extend); }
+    setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options);
+  }
+
+  // Extend all selections (pos is an array of selections with length
+  // equal the number of selections)
+  function extendSelections(doc, heads, options) {
+    var out = [];
+    var extend = doc.cm && (doc.cm.display.shift || doc.extend);
+    for (var i = 0; i < doc.sel.ranges.length; i++)
+      { out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend); }
+    var newSel = normalizeSelection(doc.cm, out, doc.sel.primIndex);
+    setSelection(doc, newSel, options);
+  }
+
+  // Updates a single range in the selection.
+  function replaceOneSelection(doc, i, range, options) {
+    var ranges = doc.sel.ranges.slice(0);
+    ranges[i] = range;
+    setSelection(doc, normalizeSelection(doc.cm, ranges, doc.sel.primIndex), options);
+  }
+
+  // Reset the selection to a single range.
+  function setSimpleSelection(doc, anchor, head, options) {
+    setSelection(doc, simpleSelection(anchor, head), options);
+  }
+
+  // Give beforeSelectionChange handlers a change to influence a
+  // selection update.
+  function filterSelectionChange(doc, sel, options) {
+    var obj = {
+      ranges: sel.ranges,
+      update: function(ranges) {
+        var this$1 = this;
+
+        this.ranges = [];
+        for (var i = 0; i < ranges.length; i++)
+          { this$1.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
+                                     clipPos(doc, ranges[i].head)); }
+      },
+      origin: options && options.origin
+    };
+    signal(doc, "beforeSelectionChange", doc, obj);
+    if (doc.cm) { signal(doc.cm, "beforeSelectionChange", doc.cm, obj); }
+    if (obj.ranges != sel.ranges) { return normalizeSelection(doc.cm, obj.ranges, obj.ranges.length - 1) }
+    else { return sel }
+  }
+
+  function setSelectionReplaceHistory(doc, sel, options) {
+    var done = doc.history.done, last = lst(done);
+    if (last && last.ranges) {
+      done[done.length - 1] = sel;
+      setSelectionNoUndo(doc, sel, options);
+    } else {
+      setSelection(doc, sel, options);
+    }
+  }
+
+  // Set a new selection.
+  function setSelection(doc, sel, options) {
+    setSelectionNoUndo(doc, sel, options);
+    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
+  }
+
+  function setSelectionNoUndo(doc, sel, options) {
+    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
+      { sel = filterSelectionChange(doc, sel, options); }
+
+    var bias = options && options.bias ||
+      (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
+    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
+
+    if (!(options && options.scroll === false) && doc.cm)
+      { ensureCursorVisible(doc.cm); }
+  }
+
+  function setSelectionInner(doc, sel) {
+    if (sel.equals(doc.sel)) { return }
+
+    doc.sel = sel;
+
+    if (doc.cm) {
+      doc.cm.curOp.updateInput = 1;
+      doc.cm.curOp.selectionChanged = true;
+      signalCursorActivity(doc.cm);
+    }
+    signalLater(doc, "cursorActivity", doc);
+  }
+
+  // Verify that the selection does not partially select any atomic
+  // marked ranges.
+  function reCheckSelection(doc) {
+    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false));
+  }
+
+  // Return a selection that does not partially select any atomic
+  // ranges.
+  function skipAtomicInSelection(doc, sel, bias, mayClear) {
+    var out;
+    for (var i = 0; i < sel.ranges.length; i++) {
+      var range = sel.ranges[i];
+      var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
+      var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
+      var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
+      if (out || newAnchor != range.anchor || newHead != range.head) {
+        if (!out) { out = sel.ranges.slice(0, i); }
+        out[i] = new Range(newAnchor, newHead);
+      }
+    }
+    return out ? normalizeSelection(doc.cm, out, sel.primIndex) : sel
+  }
+
+  function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
+    var line = getLine(doc, pos.line);
+    if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
+      var sp = line.markedSpans[i], m = sp.marker;
+
+      // Determine if we should prevent the cursor being placed to the left/right of an atomic marker
+      // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it
+      // is with selectLeft/Right
+      var preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft;
+      var preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight;
+
+      if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+          (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+        if (mayClear) {
+          signal(m, "beforeCursorEnter");
+          if (m.explicitlyCleared) {
+            if (!line.markedSpans) { break }
+            else {--i; continue}
+          }
+        }
+        if (!m.atomic) { continue }
+
+        if (oldPos) {
+          var near = m.find(dir < 0 ? 1 : -1), diff = (void 0);
+          if (dir < 0 ? preventCursorRight : preventCursorLeft)
+            { near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); }
+          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+            { return skipAtomicInner(doc, near, pos, dir, mayClear) }
+        }
+
+        var far = m.find(dir < 0 ? -1 : 1);
+        if (dir < 0 ? preventCursorLeft : preventCursorRight)
+          { far = movePos(doc, far, dir, far.line == pos.line ? line : null); }
+        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
+      }
+    } }
+    return pos
+  }
+
+  // Ensure a given position is not inside an atomic range.
+  function skipAtomic(doc, pos, oldPos, bias, mayClear) {
+    var dir = bias || 1;
+    var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
+        skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+    if (!found) {
+      doc.cantEdit = true;
+      return Pos(doc.first, 0)
+    }
+    return found
+  }
+
+  function movePos(doc, pos, dir, line) {
+    if (dir < 0 && pos.ch == 0) {
+      if (pos.line > doc.first) { return clipPos(doc, Pos(pos.line - 1)) }
+      else { return null }
+    } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
+      if (pos.line < doc.first + doc.size - 1) { return Pos(pos.line + 1, 0) }
+      else { return null }
+    } else {
+      return new Pos(pos.line, pos.ch + dir)
+    }
+  }
+
+  function selectAll(cm) {
+    cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);
+  }
+
+  // UPDATING
+
+  // Allow "beforeChange" event handlers to influence a change
+  function filterChange(doc, change, update) {
+    var obj = {
+      canceled: false,
+      from: change.from,
+      to: change.to,
+      text: change.text,
+      origin: change.origin,
+      cancel: function () { return obj.canceled = true; }
+    };
+    if (update) { obj.update = function (from, to, text, origin) {
+      if (from) { obj.from = clipPos(doc, from); }
+      if (to) { obj.to = clipPos(doc, to); }
+      if (text) { obj.text = text; }
+      if (origin !== undefined) { obj.origin = origin; }
+    }; }
+    signal(doc, "beforeChange", doc, obj);
+    if (doc.cm) { signal(doc.cm, "beforeChange", doc.cm, obj); }
+
+    if (obj.canceled) {
+      if (doc.cm) { doc.cm.curOp.updateInput = 2; }
+      return null
+    }
+    return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}
+  }
+
+  // Apply a change to a document, and add it to the document's
+  // history, and propagating it to all linked documents.
+  function makeChange(doc, change, ignoreReadOnly) {
+    if (doc.cm) {
+      if (!doc.cm.curOp) { return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly) }
+      if (doc.cm.state.suppressEdits) { return }
+    }
+
+    if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
+      change = filterChange(doc, change, true);
+      if (!change) { return }
+    }
+
+    // Possibly split or suppress the update based on the presence
+    // of read-only spans in its range.
+    var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
+    if (split) {
+      for (var i = split.length - 1; i >= 0; --i)
+        { makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text, origin: change.origin}); }
+    } else {
+      makeChangeInner(doc, change);
+    }
+  }
+
+  function makeChangeInner(doc, change) {
+    if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) { return }
+    var selAfter = computeSelAfterChange(doc, change);
+    addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
+
+    makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
+    var rebased = [];
+
+    linkedDocs(doc, function (doc, sharedHist) {
+      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
+        rebaseHist(doc.history, change);
+        rebased.push(doc.history);
+      }
+      makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
+    });
+  }
+
+  // Revert a change stored in a document's history.
+  function makeChangeFromHistory(doc, type, allowSelectionOnly) {
+    var suppress = doc.cm && doc.cm.state.suppressEdits;
+    if (suppress && !allowSelectionOnly) { return }
+
+    var hist = doc.history, event, selAfter = doc.sel;
+    var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
+
+    // Verify that there is a useable event (so that ctrl-z won't
+    // needlessly clear selection events)
+    var i = 0;
+    for (; i < source.length; i++) {
+      event = source[i];
+      if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
+        { break }
+    }
+    if (i == source.length) { return }
+    hist.lastOrigin = hist.lastSelOrigin = null;
+
+    for (;;) {
+      event = source.pop();
+      if (event.ranges) {
+        pushSelectionToHistory(event, dest);
+        if (allowSelectionOnly && !event.equals(doc.sel)) {
+          setSelection(doc, event, {clearRedo: false});
+          return
+        }
+        selAfter = event;
+      } else if (suppress) {
+        source.push(event);
+        return
+      } else { break }
+    }
+
+    // Build up a reverse change object to add to the opposite history
+    // stack (redo when undoing, and vice versa).
+    var antiChanges = [];
+    pushSelectionToHistory(selAfter, dest);
+    dest.push({changes: antiChanges, generation: hist.generation});
+    hist.generation = event.generation || ++hist.maxGeneration;
+
+    var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
+
+    var loop = function ( i ) {
+      var change = event.changes[i];
+      change.origin = type;
+      if (filter && !filterChange(doc, change, false)) {
+        source.length = 0;
+        return {}
+      }
+
+      antiChanges.push(historyChangeFromChange(doc, change));
+
+      var after = i ? computeSelAfterChange(doc, change) : lst(source);
+      makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
+      if (!i && doc.cm) { doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}); }
+      var rebased = [];
+
+      // Propagate to the linked documents
+      linkedDocs(doc, function (doc, sharedHist) {
+        if (!sharedHist && indexOf(rebased, doc.history) == -1) {
+          rebaseHist(doc.history, change);
+          rebased.push(doc.history);
+        }
+        makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
+      });
+    };
+
+    for (var i$1 = event.changes.length - 1; i$1 >= 0; --i$1) {
+      var returned = loop( i$1 );
+
+      if ( returned ) return returned.v;
+    }
+  }
+
+  // Sub-views need their line numbers shifted when text is added
+  // above or below them in the parent document.
+  function shiftDoc(doc, distance) {
+    if (distance == 0) { return }
+    doc.first += distance;
+    doc.sel = new Selection(map(doc.sel.ranges, function (range) { return new Range(
+      Pos(range.anchor.line + distance, range.anchor.ch),
+      Pos(range.head.line + distance, range.head.ch)
+    ); }), doc.sel.primIndex);
+    if (doc.cm) {
+      regChange(doc.cm, doc.first, doc.first - distance, distance);
+      for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
+        { regLineChange(doc.cm, l, "gutter"); }
+    }
+  }
+
+  // More lower-level change function, handling only a single document
+  // (not linked ones).
+  function makeChangeSingleDoc(doc, change, selAfter, spans) {
+    if (doc.cm && !doc.cm.curOp)
+      { return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans) }
+
+    if (change.to.line < doc.first) {
+      shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
+      return
+    }
+    if (change.from.line > doc.lastLine()) { return }
+
+    // Clip the change to the size of this doc
+    if (change.from.line < doc.first) {
+      var shift = change.text.length - 1 - (doc.first - change.from.line);
+      shiftDoc(doc, shift);
+      change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
+                text: [lst(change.text)], origin: change.origin};
+    }
+    var last = doc.lastLine();
+    if (change.to.line > last) {
+      change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
+                text: [change.text[0]], origin: change.origin};
+    }
+
+    change.removed = getBetween(doc, change.from, change.to);
+
+    if (!selAfter) { selAfter = computeSelAfterChange(doc, change); }
+    if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans); }
+    else { updateDoc(doc, change, spans); }
+    setSelectionNoUndo(doc, selAfter, sel_dontScroll);
+
+    if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0)))
+      { doc.cantEdit = false; }
+  }
+
+  // Handle the interaction of a change to a document with the editor
+  // that this document is part of.
+  function makeChangeSingleDocInEditor(cm, change, spans) {
+    var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
+
+    var recomputeMaxLength = false, checkWidthStart = from.line;
+    if (!cm.options.lineWrapping) {
+      checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
+      doc.iter(checkWidthStart, to.line + 1, function (line) {
+        if (line == display.maxLine) {
+          recomputeMaxLength = true;
+          return true
+        }
+      });
+    }
+
+    if (doc.sel.contains(change.from, change.to) > -1)
+      { signalCursorActivity(cm); }
+
+    updateDoc(doc, change, spans, estimateHeight(cm));
+
+    if (!cm.options.lineWrapping) {
+      doc.iter(checkWidthStart, from.line + change.text.length, function (line) {
+        var len = lineLength(line);
+        if (len > display.maxLineLength) {
+          display.maxLine = line;
+          display.maxLineLength = len;
+          display.maxLineChanged = true;
+          recomputeMaxLength = false;
+        }
+      });
+      if (recomputeMaxLength) { cm.curOp.updateMaxLine = true; }
+    }
+
+    retreatFrontier(doc, from.line);
+    startWorker(cm, 400);
+
+    var lendiff = change.text.length - (to.line - from.line) - 1;
+    // Remember that these lines changed, for updating the display
+    if (change.full)
+      { regChange(cm); }
+    else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
+      { regLineChange(cm, from.line, "text"); }
+    else
+      { regChange(cm, from.line, to.line + 1, lendiff); }
+
+    var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
+    if (changeHandler || changesHandler) {
+      var obj = {
+        from: from, to: to,
+        text: change.text,
+        removed: change.removed,
+        origin: change.origin
+      };
+      if (changeHandler) { signalLater(cm, "change", cm, obj); }
+      if (changesHandler) { (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj); }
+    }
+    cm.display.selForContextMenu = null;
+  }
+
+  function replaceRange(doc, code, from, to, origin) {
+    var assign;
+
+    if (!to) { to = from; }
+    if (cmp(to, from) < 0) { (assign = [to, from], from = assign[0], to = assign[1]); }
+    if (typeof code == "string") { code = doc.splitLines(code); }
+    makeChange(doc, {from: from, to: to, text: code, origin: origin});
+  }
+
+  // Rebasing/resetting history to deal with externally-sourced changes
+
+  function rebaseHistSelSingle(pos, from, to, diff) {
+    if (to < pos.line) {
+      pos.line += diff;
+    } else if (from < pos.line) {
+      pos.line = from;
+      pos.ch = 0;
+    }
+  }
+
+  // Tries to rebase an array of history events given a change in the
+  // document. If the change touches the same lines as the event, the
+  // event, and everything 'behind' it, is discarded. If the change is
+  // before the event, the event's positions are updated. Uses a
+  // copy-on-write scheme for the positions, to avoid having to
+  // reallocate them all on every rebase, but also avoid problems with
+  // shared position objects being unsafely updated.
+  function rebaseHistArray(array, from, to, diff) {
+    for (var i = 0; i < array.length; ++i) {
+      var sub = array[i], ok = true;
+      if (sub.ranges) {
+        if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
+        for (var j = 0; j < sub.ranges.length; j++) {
+          rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
+          rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
+        }
+        continue
+      }
+      for (var j$1 = 0; j$1 < sub.changes.length; ++j$1) {
+        var cur = sub.changes[j$1];
+        if (to < cur.from.line) {
+          cur.from = Pos(cur.from.line + diff, cur.from.ch);
+          cur.to = Pos(cur.to.line + diff, cur.to.ch);
+        } else if (from <= cur.to.line) {
+          ok = false;
+          break
+        }
+      }
+      if (!ok) {
+        array.splice(0, i + 1);
+        i = 0;
+      }
+    }
+  }
+
+  function rebaseHist(hist, change) {
+    var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
+    rebaseHistArray(hist.done, from, to, diff);
+    rebaseHistArray(hist.undone, from, to, diff);
+  }
+
+  // Utility for applying a change to a line by handle or number,
+  // returning the number and optionally registering the line as
+  // changed.
+  function changeLine(doc, handle, changeType, op) {
+    var no = handle, line = handle;
+    if (typeof handle == "number") { line = getLine(doc, clipLine(doc, handle)); }
+    else { no = lineNo(handle); }
+    if (no == null) { return null }
+    if (op(line, no) && doc.cm) { regLineChange(doc.cm, no, changeType); }
+    return line
+  }
+
+  // The document is represented as a BTree consisting of leaves, with
+  // chunk of lines in them, and branches, with up to ten leaves or
+  // other branch nodes below them. The top node is always a branch
+  // node, and is the document object itself (meaning it has
+  // additional methods and properties).
+  //
+  // All nodes have parent links. The tree is used both to go from
+  // line numbers to line objects, and to go from objects to numbers.
+  // It also indexes by height, and is used to convert between height
+  // and line object, and to find the total height of the document.
+  //
+  // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
+
+  function LeafChunk(lines) {
+    var this$1 = this;
+
+    this.lines = lines;
+    this.parent = null;
+    var height = 0;
+    for (var i = 0; i < lines.length; ++i) {
+      lines[i].parent = this$1;
+      height += lines[i].height;
+    }
+    this.height = height;
+  }
+
+  LeafChunk.prototype = {
+    chunkSize: function() { return this.lines.length },
+
+    // Remove the n lines at offset 'at'.
+    removeInner: function(at, n) {
+      var this$1 = this;
+
+      for (var i = at, e = at + n; i < e; ++i) {
+        var line = this$1.lines[i];
+        this$1.height -= line.height;
+        cleanUpLine(line);
+        signalLater(line, "delete");
+      }
+      this.lines.splice(at, n);
+    },
+
+    // Helper used to collapse a small branch into a single leaf.
+    collapse: function(lines) {
+      lines.push.apply(lines, this.lines);
+    },
+
+    // Insert the given array of lines at offset 'at', count them as
+    // having the given height.
+    insertInner: function(at, lines, height) {
+      var this$1 = this;
+
+      this.height += height;
+      this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
+      for (var i = 0; i < lines.length; ++i) { lines[i].parent = this$1; }
+    },
+
+    // Used to iterate over a part of the tree.
+    iterN: function(at, n, op) {
+      var this$1 = this;
+
+      for (var e = at + n; at < e; ++at)
+        { if (op(this$1.lines[at])) { return true } }
+    }
+  };
+
+  function BranchChunk(children) {
+    var this$1 = this;
+
+    this.children = children;
+    var size = 0, height = 0;
+    for (var i = 0; i < children.length; ++i) {
+      var ch = children[i];
+      size += ch.chunkSize(); height += ch.height;
+      ch.parent = this$1;
+    }
+    this.size = size;
+    this.height = height;
+    this.parent = null;
+  }
+
+  BranchChunk.prototype = {
+    chunkSize: function() { return this.size },
+
+    removeInner: function(at, n) {
+      var this$1 = this;
+
+      this.size -= n;
+      for (var i = 0; i < this.children.length; ++i) {
+        var child = this$1.children[i], sz = child.chunkSize();
+        if (at < sz) {
+          var rm = Math.min(n, sz - at), oldHeight = child.height;
+          child.removeInner(at, rm);
+          this$1.height -= oldHeight - child.height;
+          if (sz == rm) { this$1.children.splice(i--, 1); child.parent = null; }
+          if ((n -= rm) == 0) { break }
+          at = 0;
+        } else { at -= sz; }
+      }
+      // If the result is smaller than 25 lines, ensure that it is a
+      // single leaf node.
+      if (this.size - n < 25 &&
+          (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
+        var lines = [];
+        this.collapse(lines);
+        this.children = [new LeafChunk(lines)];
+        this.children[0].parent = this;
+      }
+    },
+
+    collapse: function(lines) {
+      var this$1 = this;
+
+      for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines); }
+    },
+
+    insertInner: function(at, lines, height) {
+      var this$1 = this;
+
+      this.size += lines.length;
+      this.height += height;
+      for (var i = 0; i < this.children.length; ++i) {
+        var child = this$1.children[i], sz = child.chunkSize();
+        if (at <= sz) {
+          child.insertInner(at, lines, height);
+          if (child.lines && child.lines.length > 50) {
+            // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
+            // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
+            var remaining = child.lines.length % 25 + 25;
+            for (var pos = remaining; pos < child.lines.length;) {
+              var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
+              child.height -= leaf.height;
+              this$1.children.splice(++i, 0, leaf);
+              leaf.parent = this$1;
+            }
+            child.lines = child.lines.slice(0, remaining);
+            this$1.maybeSpill();
+          }
+          break
+        }
+        at -= sz;
+      }
+    },
+
+    // When a node has grown, check whether it should be split.
+    maybeSpill: function() {
+      if (this.children.length <= 10) { return }
+      var me = this;
+      do {
+        var spilled = me.children.splice(me.children.length - 5, 5);
+        var sibling = new BranchChunk(spilled);
+        if (!me.parent) { // Become the parent node
+          var copy = new BranchChunk(me.children);
+          copy.parent = me;
+          me.children = [copy, sibling];
+          me = copy;
+       } else {
+          me.size -= sibling.size;
+          me.height -= sibling.height;
+          var myIndex = indexOf(me.parent.children, me);
+          me.parent.children.splice(myIndex + 1, 0, sibling);
+        }
+        sibling.parent = me.parent;
+      } while (me.children.length > 10)
+      me.parent.maybeSpill();
+    },
+
+    iterN: function(at, n, op) {
+      var this$1 = this;
+
+      for (var i = 0; i < this.children.length; ++i) {
+        var child = this$1.children[i], sz = child.chunkSize();
+        if (at < sz) {
+          var used = Math.min(n, sz - at);
+          if (child.iterN(at, used, op)) { return true }
+          if ((n -= used) == 0) { break }
+          at = 0;
+        } else { at -= sz; }
+      }
+    }
+  };
+
+  // Line widgets are block elements displayed above or below a line.
+
+  var LineWidget = function(doc, node, options) {
+    var this$1 = this;
+
+    if (options) { for (var opt in options) { if (options.hasOwnProperty(opt))
+      { this$1[opt] = options[opt]; } } }
+    this.doc = doc;
+    this.node = node;
+  };
+
+  LineWidget.prototype.clear = function () {
+      var this$1 = this;
+
+    var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
+    if (no == null || !ws) { return }
+    for (var i = 0; i < ws.length; ++i) { if (ws[i] == this$1) { ws.splice(i--, 1); } }
+    if (!ws.length) { line.widgets = null; }
+    var height = widgetHeight(this);
+    updateLineHeight(line, Math.max(0, line.height - height));
+    if (cm) {
+      runInOp(cm, function () {
+        adjustScrollWhenAboveVisible(cm, line, -height);
+        regLineChange(cm, no, "widget");
+      });
+      signalLater(cm, "lineWidgetCleared", cm, this, no);
+    }
+  };
+
+  LineWidget.prototype.changed = function () {
+      var this$1 = this;
+
+    var oldH = this.height, cm = this.doc.cm, line = this.line;
+    this.height = null;
+    var diff = widgetHeight(this) - oldH;
+    if (!diff) { return }
+    if (!lineIsHidden(this.doc, line)) { updateLineHeight(line, line.height + diff); }
+    if (cm) {
+      runInOp(cm, function () {
+        cm.curOp.forceUpdate = true;
+        adjustScrollWhenAboveVisible(cm, line, diff);
+        signalLater(cm, "lineWidgetChanged", cm, this$1, lineNo(line));
+      });
+    }
+  };
+  eventMixin(LineWidget);
+
+  function adjustScrollWhenAboveVisible(cm, line, diff) {
+    if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
+      { addToScrollTop(cm, diff); }
+  }
+
+  function addLineWidget(doc, handle, node, options) {
+    var widget = new LineWidget(doc, node, options);
+    var cm = doc.cm;
+    if (cm && widget.noHScroll) { cm.display.alignWidgets = true; }
+    changeLine(doc, handle, "widget", function (line) {
+      var widgets = line.widgets || (line.widgets = []);
+      if (widget.insertAt == null) { widgets.push(widget); }
+      else { widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget); }
+      widget.line = line;
+      if (cm && !lineIsHidden(doc, line)) {
+        var aboveVisible = heightAtLine(line) < doc.scrollTop;
+        updateLineHeight(line, line.height + widgetHeight(widget));
+        if (aboveVisible) { addToScrollTop(cm, widget.height); }
+        cm.curOp.forceUpdate = true;
+      }
+      return true
+    });
+    if (cm) { signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); }
+    return widget
+  }
+
+  // TEXTMARKERS
+
+  // Created with markText and setBookmark methods. A TextMarker is a
+  // handle that can be used to clear or find a marked position in the
+  // document. Line objects hold arrays (markedSpans) containing
+  // {from, to, marker} object pointing to such marker objects, and
+  // indicating that such a marker is present on that line. Multiple
+  // lines may point to the same marker when it spans across lines.
+  // The spans will have null for their from/to properties when the
+  // marker continues beyond the start/end of the line. Markers have
+  // links back to the lines they currently touch.
+
+  // Collapsed markers have unique ids, in order to be able to order
+  // them, which is needed for uniquely determining an outer marker
+  // when they overlap (they may nest, but not partially overlap).
+  var nextMarkerId = 0;
+
+  var TextMarker = function(doc, type) {
+    this.lines = [];
+    this.type = type;
+    this.doc = doc;
+    this.id = ++nextMarkerId;
+  };
+
+  // Clear the marker.
+  TextMarker.prototype.clear = function () {
+      var this$1 = this;
+
+    if (this.explicitlyCleared) { return }
+    var cm = this.doc.cm, withOp = cm && !cm.curOp;
+    if (withOp) { startOperation(cm); }
+    if (hasHandler(this, "clear")) {
+      var found = this.find();
+      if (found) { signalLater(this, "clear", found.from, found.to); }
+    }
+    var min = null, max = null;
+    for (var i = 0; i < this.lines.length; ++i) {
+      var line = this$1.lines[i];
+      var span = getMarkedSpanFor(line.markedSpans, this$1);
+      if (cm && !this$1.collapsed) { regLineChange(cm, lineNo(line), "text"); }
+      else if (cm) {
+        if (span.to != null) { max = lineNo(line); }
+        if (span.from != null) { min = lineNo(line); }
+      }
+      line.markedSpans = removeMarkedSpan(line.markedSpans, span);
+      if (span.from == null && this$1.collapsed && !lineIsHidden(this$1.doc, line) && cm)
+        { updateLineHeight(line, textHeight(cm.display)); }
+    }
+    if (cm && this.collapsed && !cm.options.lineWrapping) { for (var i$1 = 0; i$1 < this.lines.length; ++i$1) {
+      var visual = visualLine(this$1.lines[i$1]), len = lineLength(visual);
+      if (len > cm.display.maxLineLength) {
+        cm.display.maxLine = visual;
+        cm.display.maxLineLength = len;
+        cm.display.maxLineChanged = true;
+      }
+    } }
+
+    if (min != null && cm && this.collapsed) { regChange(cm, min, max + 1); }
+    this.lines.length = 0;
+    this.explicitlyCleared = true;
+    if (this.atomic && this.doc.cantEdit) {
+      this.doc.cantEdit = false;
+      if (cm) { reCheckSelection(cm.doc); }
+    }
+    if (cm) { signalLater(cm, "markerCleared", cm, this, min, max); }
+    if (withOp) { endOperation(cm); }
+    if (this.parent) { this.parent.clear(); }
+  };
+
+  // Find the position of the marker in the document. Returns a {from,
+  // to} object by default. Side can be passed to get a specific side
+  // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
+  // Pos objects returned contain a line object, rather than a line
+  // number (used to prevent looking up the same line twice).
+  TextMarker.prototype.find = function (side, lineObj) {
+      var this$1 = this;
+
+    if (side == null && this.type == "bookmark") { side = 1; }
+    var from, to;
+    for (var i = 0; i < this.lines.length; ++i) {
+      var line = this$1.lines[i];
+      var span = getMarkedSpanFor(line.markedSpans, this$1);
+      if (span.from != null) {
+        from = Pos(lineObj ? line : lineNo(line), span.from);
+        if (side == -1) { return from }
+      }
+      if (span.to != null) {
+        to = Pos(lineObj ? line : lineNo(line), span.to);
+        if (side == 1) { return to }
+      }
+    }
+    return from && {from: from, to: to}
+  };
+
+  // Signals that the marker's widget changed, and surrounding layout
+  // should be recomputed.
+  TextMarker.prototype.changed = function () {
+      var this$1 = this;
+
+    var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
+    if (!pos || !cm) { return }
+    runInOp(cm, function () {
+      var line = pos.line, lineN = lineNo(pos.line);
+      var view = findViewForLine(cm, lineN);
+      if (view) {
+        clearLineMeasurementCacheFor(view);
+        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
+      }
+      cm.curOp.updateMaxLine = true;
+      if (!lineIsHidden(widget.doc, line) && widget.height != null) {
+        var oldHeight = widget.height;
+        widget.height = null;
+        var dHeight = widgetHeight(widget) - oldHeight;
+        if (dHeight)
+          { updateLineHeight(line, line.height + dHeight); }
+      }
+      signalLater(cm, "markerChanged", cm, this$1);
+    });
+  };
+
+  TextMarker.prototype.attachLine = function (line) {
+    if (!this.lines.length && this.doc.cm) {
+      var op = this.doc.cm.curOp;
+      if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
+        { (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this); }
+    }
+    this.lines.push(line);
+  };
+
+  TextMarker.prototype.detachLine = function (line) {
+    this.lines.splice(indexOf(this.lines, line), 1);
+    if (!this.lines.length && this.doc.cm) {
+      var op = this.doc.cm.curOp
+      ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
+    }
+  };
+  eventMixin(TextMarker);
+
+  // Create a marker, wire it up to the right lines, and
+  function markText(doc, from, to, options, type) {
+    // Shared markers (across linked documents) are handled separately
+    // (markTextShared will call out to this again, once per
+    // document).
+    if (options && options.shared) { return markTextShared(doc, from, to, options, type) }
+    // Ensure we are in an operation.
+    if (doc.cm && !doc.cm.curOp) { return operation(doc.cm, markText)(doc, from, to, options, type) }
+
+    var marker = new TextMarker(doc, type), diff = cmp(from, to);
+    if (options) { copyObj(options, marker, false); }
+    // Don't connect empty markers unless clearWhenEmpty is false
+    if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
+      { return marker }
+    if (marker.replacedWith) {
+      // Showing up as a widget implies collapsed (widget replaces text)
+      marker.collapsed = true;
+      marker.widgetNode = eltP("span", [marker.replacedWith], "CodeMirror-widget");
+      if (!options.handleMouseEvents) { marker.widgetNode.setAttribute("cm-ignore-events", "true"); }
+      if (options.insertLeft) { marker.widgetNode.insertLeft = true; }
+    }
+    if (marker.collapsed) {
+      if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
+          from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
+        { throw new Error("Inserting collapsed marker partially overlapping an existing one") }
+      seeCollapsedSpans();
+    }
+
+    if (marker.addToHistory)
+      { addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN); }
+
+    var curLine = from.line, cm = doc.cm, updateMaxLine;
+    doc.iter(curLine, to.line + 1, function (line) {
+      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
+        { updateMaxLine = true; }
+      if (marker.collapsed && curLine != from.line) { updateLineHeight(line, 0); }
+      addMarkedSpan(line, new MarkedSpan(marker,
+                                         curLine == from.line ? from.ch : null,
+                                         curLine == to.line ? to.ch : null));
+      ++curLine;
+    });
+    // lineIsHidden depends on the presence of the spans, so needs a second pass
+    if (marker.collapsed) { doc.iter(from.line, to.line + 1, function (line) {
+      if (lineIsHidden(doc, line)) { updateLineHeight(line, 0); }
+    }); }
+
+    if (marker.clearOnEnter) { on(marker, "beforeCursorEnter", function () { return marker.clear(); }); }
+
+    if (marker.readOnly) {
+      seeReadOnlySpans();
+      if (doc.history.done.length || doc.history.undone.length)
+        { doc.clearHistory(); }
+    }
+    if (marker.collapsed) {
+      marker.id = ++nextMarkerId;
+      marker.atomic = true;
+    }
+    if (cm) {
+      // Sync editor state
+      if (updateMaxLine) { cm.curOp.updateMaxLine = true; }
+      if (marker.collapsed)
+        { regChange(cm, from.line, to.line + 1); }
+      else if (marker.className || marker.startStyle || marker.endStyle || marker.css ||
+               marker.attributes || marker.title)
+        { for (var i = from.line; i <= to.line; i++) { regLineChange(cm, i, "text"); } }
+      if (marker.atomic) { reCheckSelection(cm.doc); }
+      signalLater(cm, "markerAdded", cm, marker);
+    }
+    return marker
+  }
+
+  // SHARED TEXTMARKERS
+
+  // A shared marker spans multiple linked documents. It is
+  // implemented as a meta-marker-object controlling multiple normal
+  // markers.
+  var SharedTextMarker = function(markers, primary) {
+    var this$1 = this;
+
+    this.markers = markers;
+    this.primary = primary;
+    for (var i = 0; i < markers.length; ++i)
+      { markers[i].parent = this$1; }
+  };
+
+  SharedTextMarker.prototype.clear = function () {
+      var this$1 = this;
+
+    if (this.explicitlyCleared) { return }
+    this.explicitlyCleared = true;
+    for (var i = 0; i < this.markers.length; ++i)
+      { this$1.markers[i].clear(); }
+    signalLater(this, "clear");
+  };
+
+  SharedTextMarker.prototype.find = function (side, lineObj) {
+    return this.primary.find(side, lineObj)
+  };
+  eventMixin(SharedTextMarker);
+
+  function markTextShared(doc, from, to, options, type) {
+    options = copyObj(options);
+    options.shared = false;
+    var markers = [markText(doc, from, to, options, type)], primary = markers[0];
+    var widget = options.widgetNode;
+    linkedDocs(doc, function (doc) {
+      if (widget) { options.widgetNode = widget.cloneNode(true); }
+      markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
+      for (var i = 0; i < doc.linked.length; ++i)
+        { if (doc.linked[i].isParent) { return } }
+      primary = lst(markers);
+    });
+    return new SharedTextMarker(markers, primary)
+  }
+
+  function findSharedMarkers(doc) {
+    return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), function (m) { return m.parent; })
+  }
+
+  function copySharedMarkers(doc, markers) {
+    for (var i = 0; i < markers.length; i++) {
+      var marker = markers[i], pos = marker.find();
+      var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
+      if (cmp(mFrom, mTo)) {
+        var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
+        marker.markers.push(subMark);
+        subMark.parent = marker;
+      }
+    }
+  }
+
+  function detachSharedMarkers(markers) {
+    var loop = function ( i ) {
+      var marker = markers[i], linked = [marker.primary.doc];
+      linkedDocs(marker.primary.doc, function (d) { return linked.push(d); });
+      for (var j = 0; j < marker.markers.length; j++) {
+        var subMarker = marker.markers[j];
+        if (indexOf(linked, subMarker.doc) == -1) {
+          subMarker.parent = null;
+          marker.markers.splice(j--, 1);
+        }
+      }
+    };
+
+    for (var i = 0; i < markers.length; i++) loop( i );
+  }
+
+  var nextDocId = 0;
+  var Doc = function(text, mode, firstLine, lineSep, direction) {
+    if (!(this instanceof Doc)) { return new Doc(text, mode, firstLine, lineSep, direction) }
+    if (firstLine == null) { firstLine = 0; }
+
+    BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
+    this.first = firstLine;
+    this.scrollTop = this.scrollLeft = 0;
+    this.cantEdit = false;
+    this.cleanGeneration = 1;
+    this.modeFrontier = this.highlightFrontier = firstLine;
+    var start = Pos(firstLine, 0);
+    this.sel = simpleSelection(start);
+    this.history = new History(null);
+    this.id = ++nextDocId;
+    this.modeOption = mode;
+    this.lineSep = lineSep;
+    this.direction = (direction == "rtl") ? "rtl" : "ltr";
+    this.extend = false;
+
+    if (typeof text == "string") { text = this.splitLines(text); }
+    updateDoc(this, {from: start, to: start, text: text});
+    setSelection(this, simpleSelection(start), sel_dontScroll);
+  };
+
+  Doc.prototype = createObj(BranchChunk.prototype, {
+    constructor: Doc,
+    // Iterate over the document. Supports two forms -- with only one
+    // argument, it calls that for each line in the document. With
+    // three, it iterates over the range given by the first two (with
+    // the second being non-inclusive).
+    iter: function(from, to, op) {
+      if (op) { this.iterN(from - this.first, to - from, op); }
+      else { this.iterN(this.first, this.first + this.size, from); }
+    },
+
+    // Non-public interface for adding and removing lines.
+    insert: function(at, lines) {
+      var height = 0;
+      for (var i = 0; i < lines.length; ++i) { height += lines[i].height; }
+      this.insertInner(at - this.first, lines, height);
+    },
+    remove: function(at, n) { this.removeInner(at - this.first, n); },
+
+    // From here, the methods are part of the public interface. Most
+    // are also available from CodeMirror (editor) instances.
+
+    getValue: function(lineSep) {
+      var lines = getLines(this, this.first, this.first + this.size);
+      if (lineSep === false) { return lines }
+      return lines.join(lineSep || this.lineSeparator())
+    },
+    setValue: docMethodOp(function(code) {
+      var top = Pos(this.first, 0), last = this.first + this.size - 1;
+      makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
+                        text: this.splitLines(code), origin: "setValue", full: true}, true);
+      if (this.cm) { scrollToCoords(this.cm, 0, 0); }
+      setSelection(this, simpleSelection(top), sel_dontScroll);
+    }),
+    replaceRange: function(code, from, to, origin) {
+      from = clipPos(this, from);
+      to = to ? clipPos(this, to) : from;
+      replaceRange(this, code, from, to, origin);
+    },
+    getRange: function(from, to, lineSep) {
+      var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
+      if (lineSep === false) { return lines }
+      return lines.join(lineSep || this.lineSeparator())
+    },
+
+    getLine: function(line) {var l = this.getLineHandle(line); return l && l.text},
+
+    getLineHandle: function(line) {if (isLine(this, line)) { return getLine(this, line) }},
+    getLineNumber: function(line) {return lineNo(line)},
+
+    getLineHandleVisualStart: function(line) {
+      if (typeof line == "number") { line = getLine(this, line); }
+      return visualLine(line)
+    },
+
+    lineCount: function() {return this.size},
+    firstLine: function() {return this.first},
+    lastLine: function() {return this.first + this.size - 1},
+
+    clipPos: function(pos) {return clipPos(this, pos)},
+
+    getCursor: function(start) {
+      var range$$1 = this.sel.primary(), pos;
+      if (start == null || start == "head") { pos = range$$1.head; }
+      else if (start == "anchor") { pos = range$$1.anchor; }
+      else if (start == "end" || start == "to" || start === false) { pos = range$$1.to(); }
+      else { pos = range$$1.from(); }
+      return pos
+    },
+    listSelections: function() { return this.sel.ranges },
+    somethingSelected: function() {return this.sel.somethingSelected()},
+
+    setCursor: docMethodOp(function(line, ch, options) {
+      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
+    }),
+    setSelection: docMethodOp(function(anchor, head, options) {
+      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
+    }),
+    extendSelection: docMethodOp(function(head, other, options) {
+      extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
+    }),
+    extendSelections: docMethodOp(function(heads, options) {
+      extendSelections(this, clipPosArray(this, heads), options);
+    }),
+    extendSelectionsBy: docMethodOp(function(f, options) {
+      var heads = map(this.sel.ranges, f);
+      extendSelections(this, clipPosArray(this, heads), options);
+    }),
+    setSelections: docMethodOp(function(ranges, primary, options) {
+      var this$1 = this;
+
+      if (!ranges.length) { return }
+      var out = [];
+      for (var i = 0; i < ranges.length; i++)
+        { out[i] = new Range(clipPos(this$1, ranges[i].anchor),
+                           clipPos(this$1, ranges[i].head)); }
+      if (primary == null) { primary = Math.min(ranges.length - 1, this.sel.primIndex); }
+      setSelection(this, normalizeSelection(this.cm, out, primary), options);
+    }),
+    addSelection: docMethodOp(function(anchor, head, options) {
+      var ranges = this.sel.ranges.slice(0);
+      ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
+      setSelection(this, normalizeSelection(this.cm, ranges, ranges.length - 1), options);
+    }),
+
+    getSelection: function(lineSep) {
+      var this$1 = this;
+
+      var ranges = this.sel.ranges, lines;
+      for (var i = 0; i < ranges.length; i++) {
+        var sel = getBetween(this$1, ranges[i].from(), ranges[i].to());
+        lines = lines ? lines.concat(sel) : sel;
+      }
+      if (lineSep === false) { return lines }
+      else { return lines.join(lineSep || this.lineSeparator()) }
+    },
+    getSelections: function(lineSep) {
+      var this$1 = this;
+
+      var parts = [], ranges = this.sel.ranges;
+      for (var i = 0; i < ranges.length; i++) {
+        var sel = getBetween(this$1, ranges[i].from(), ranges[i].to());
+        if (lineSep !== false) { sel = sel.join(lineSep || this$1.lineSeparator()); }
+        parts[i] = sel;
+      }
+      return parts
+    },
+    replaceSelection: function(code, collapse, origin) {
+      var dup = [];
+      for (var i = 0; i < this.sel.ranges.length; i++)
+        { dup[i] = code; }
+      this.replaceSelections(dup, collapse, origin || "+input");
+    },
+    replaceSelections: docMethodOp(function(code, collapse, origin) {
+      var this$1 = this;
+
+      var changes = [], sel = this.sel;
+      for (var i = 0; i < sel.ranges.length; i++) {
+        var range$$1 = sel.ranges[i];
+        changes[i] = {from: range$$1.from(), to: range$$1.to(), text: this$1.splitLines(code[i]), origin: origin};
+      }
+      var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
+      for (var i$1 = changes.length - 1; i$1 >= 0; i$1--)
+        { makeChange(this$1, changes[i$1]); }
+      if (newSel) { setSelectionReplaceHistory(this, newSel); }
+      else if (this.cm) { ensureCursorVisible(this.cm); }
+    }),
+    undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
+    redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
+    undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
+    redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
+
+    setExtending: function(val) {this.extend = val;},
+    getExtending: function() {return this.extend},
+
+    historySize: function() {
+      var hist = this.history, done = 0, undone = 0;
+      for (var i = 0; i < hist.done.length; i++) { if (!hist.done[i].ranges) { ++done; } }
+      for (var i$1 = 0; i$1 < hist.undone.length; i$1++) { if (!hist.undone[i$1].ranges) { ++undone; } }
+      return {undo: done, redo: undone}
+    },
+    clearHistory: function() {this.history = new History(this.history.maxGeneration);},
+
+    markClean: function() {
+      this.cleanGeneration = this.changeGeneration(true);
+    },
+    changeGeneration: function(forceSplit) {
+      if (forceSplit)
+        { this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null; }
+      return this.history.generation
+    },
+    isClean: function (gen) {
+      return this.history.generation == (gen || this.cleanGeneration)
+    },
+
+    getHistory: function() {
+      return {done: copyHistoryArray(this.history.done),
+              undone: copyHistoryArray(this.history.undone)}
+    },
+    setHistory: function(histData) {
+      var hist = this.history = new History(this.history.maxGeneration);
+      hist.done = copyHistoryArray(histData.done.slice(0), null, true);
+      hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
+    },
+
+    setGutterMarker: docMethodOp(function(line, gutterID, value) {
+      return changeLine(this, line, "gutter", function (line) {
+        var markers = line.gutterMarkers || (line.gutterMarkers = {});
+        markers[gutterID] = value;
+        if (!value && isEmpty(markers)) { line.gutterMarkers = null; }
+        return true
+      })
+    }),
+
+    clearGutter: docMethodOp(function(gutterID) {
+      var this$1 = this;
+
+      this.iter(function (line) {
+        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
+          changeLine(this$1, line, "gutter", function () {
+            line.gutterMarkers[gutterID] = null;
+            if (isEmpty(line.gutterMarkers)) { line.gutterMarkers = null; }
+            return true
+          });
+        }
+      });
+    }),
+
+    lineInfo: function(line) {
+      var n;
+      if (typeof line == "number") {
+        if (!isLine(this, line)) { return null }
+        n = line;
+        line = getLine(this, line);
+        if (!line) { return null }
+      } else {
+        n = lineNo(line);
+        if (n == null) { return null }
+      }
+      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
+              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
+              widgets: line.widgets}
+    },
+
+    addLineClass: docMethodOp(function(handle, where, cls) {
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
+        if (!line[prop]) { line[prop] = cls; }
+        else if (classTest(cls).test(line[prop])) { return false }
+        else { line[prop] += " " + cls; }
+        return true
+      })
+    }),
+    removeLineClass: docMethodOp(function(handle, where, cls) {
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
+        var cur = line[prop];
+        if (!cur) { return false }
+        else if (cls == null) { line[prop] = null; }
+        else {
+          var found = cur.match(classTest(cls));
+          if (!found) { return false }
+          var end = found.index + found[0].length;
+          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
+        }
+        return true
+      })
+    }),
+
+    addLineWidget: docMethodOp(function(handle, node, options) {
+      return addLineWidget(this, handle, node, options)
+    }),
+    removeLineWidget: function(widget) { widget.clear(); },
+
+    markText: function(from, to, options) {
+      return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range")
+    },
+    setBookmark: function(pos, options) {
+      var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
+                      insertLeft: options && options.insertLeft,
+                      clearWhenEmpty: false, shared: options && options.shared,
+                      handleMouseEvents: options && options.handleMouseEvents};
+      pos = clipPos(this, pos);
+      return markText(this, pos, pos, realOpts, "bookmark")
+    },
+    findMarksAt: function(pos) {
+      pos = clipPos(this, pos);
+      var markers = [], spans = getLine(this, pos.line).markedSpans;
+      if (spans) { for (var i = 0; i < spans.length; ++i) {
+        var span = spans[i];
+        if ((span.from == null || span.from <= pos.ch) &&
+            (span.to == null || span.to >= pos.ch))
+          { markers.push(span.marker.parent || span.marker); }
+      } }
+      return markers
+    },
+    findMarks: function(from, to, filter) {
+      from = clipPos(this, from); to = clipPos(this, to);
+      var found = [], lineNo$$1 = from.line;
+      this.iter(from.line, to.line + 1, function (line) {
+        var spans = line.markedSpans;
+        if (spans) { for (var i = 0; i < spans.length; i++) {
+          var span = spans[i];
+          if (!(span.to != null && lineNo$$1 == from.line && from.ch >= span.to ||
+                span.from == null && lineNo$$1 != from.line ||
+                span.from != null && lineNo$$1 == to.line && span.from >= to.ch) &&
+              (!filter || filter(span.marker)))
+            { found.push(span.marker.parent || span.marker); }
+        } }
+        ++lineNo$$1;
+      });
+      return found
+    },
+    getAllMarks: function() {
+      var markers = [];
+      this.iter(function (line) {
+        var sps = line.markedSpans;
+        if (sps) { for (var i = 0; i < sps.length; ++i)
+          { if (sps[i].from != null) { markers.push(sps[i].marker); } } }
+      });
+      return markers
+    },
+
+    posFromIndex: function(off) {
+      var ch, lineNo$$1 = this.first, sepSize = this.lineSeparator().length;
+      this.iter(function (line) {
+        var sz = line.text.length + sepSize;
+        if (sz > off) { ch = off; return true }
+        off -= sz;
+        ++lineNo$$1;
+      });
+      return clipPos(this, Pos(lineNo$$1, ch))
+    },
+    indexFromPos: function (coords) {
+      coords = clipPos(this, coords);
+      var index = coords.ch;
+      if (coords.line < this.first || coords.ch < 0) { return 0 }
+      var sepSize = this.lineSeparator().length;
+      this.iter(this.first, coords.line, function (line) { // iter aborts when callback returns a truthy value
+        index += line.text.length + sepSize;
+      });
+      return index
+    },
+
+    copy: function(copyHistory) {
+      var doc = new Doc(getLines(this, this.first, this.first + this.size),
+                        this.modeOption, this.first, this.lineSep, this.direction);
+      doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
+      doc.sel = this.sel;
+      doc.extend = false;
+      if (copyHistory) {
+        doc.history.undoDepth = this.history.undoDepth;
+        doc.setHistory(this.getHistory());
+      }
+      return doc
+    },
+
+    linkedDoc: function(options) {
+      if (!options) { options = {}; }
+      var from = this.first, to = this.first + this.size;
+      if (options.from != null && options.from > from) { from = options.from; }
+      if (options.to != null && options.to < to) { to = options.to; }
+      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep, this.direction);
+      if (options.sharedHist) { copy.history = this.history
+      ; }(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
+      copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
+      copySharedMarkers(copy, findSharedMarkers(this));
+      return copy
+    },
+    unlinkDoc: function(other) {
+      var this$1 = this;
+
+      if (other instanceof CodeMirror) { other = other.doc; }
+      if (this.linked) { for (var i = 0; i < this.linked.length; ++i) {
+        var link = this$1.linked[i];
+        if (link.doc != other) { continue }
+        this$1.linked.splice(i, 1);
+        other.unlinkDoc(this$1);
+        detachSharedMarkers(findSharedMarkers(this$1));
+        break
+      } }
+      // If the histories were shared, split them again
+      if (other.history == this.history) {
+        var splitIds = [other.id];
+        linkedDocs(other, function (doc) { return splitIds.push(doc.id); }, true);
+        other.history = new History(null);
+        other.history.done = copyHistoryArray(this.history.done, splitIds);
+        other.history.undone = copyHistoryArray(this.history.undone, splitIds);
+      }
+    },
+    iterLinkedDocs: function(f) {linkedDocs(this, f);},
+
+    getMode: function() {return this.mode},
+    getEditor: function() {return this.cm},
+
+    splitLines: function(str) {
+      if (this.lineSep) { return str.split(this.lineSep) }
+      return splitLinesAuto(str)
+    },
+    lineSeparator: function() { return this.lineSep || "\n" },
+
+    setDirection: docMethodOp(function (dir) {
+      if (dir != "rtl") { dir = "ltr"; }
+      if (dir == this.direction) { return }
+      this.direction = dir;
+      this.iter(function (line) { return line.order = null; });
+      if (this.cm) { directionChanged(this.cm); }
+    })
+  });
+
+  // Public alias.
+  Doc.prototype.eachLine = Doc.prototype.iter;
+
+  // Kludge to work around strange IE behavior where it'll sometimes
+  // re-fire a series of drag-related events right after the drop (#1551)
+  var lastDrop = 0;
+
+  function onDrop(e) {
+    var cm = this;
+    clearDragCursor(cm);
+    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
+      { return }
+    e_preventDefault(e);
+    if (ie) { lastDrop = +new Date; }
+    var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
+    if (!pos || cm.isReadOnly()) { return }
+    // Might be a file drop, in which case we simply extract the text
+    // and insert it.
+    if (files && files.length && window.FileReader && window.File) {
+      var n = files.length, text = Array(n), read = 0;
+      var loadFile = function (file, i) {
+        if (cm.options.allowDropFileTypes &&
+            indexOf(cm.options.allowDropFileTypes, file.type) == -1)
+          { return }
+
+        var reader = new FileReader;
+        reader.onload = operation(cm, function () {
+          var content = reader.result;
+          if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) { content = ""; }
+          text[i] = content;
+          if (++read == n) {
+            pos = clipPos(cm.doc, pos);
+            var change = {from: pos, to: pos,
+                          text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+                          origin: "paste"};
+            makeChange(cm.doc, change);
+            setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
+          }
+        });
+        reader.readAsText(file);
+      };
+      for (var i = 0; i < n; ++i) { loadFile(files[i], i); }
+    } else { // Normal drop
+      // Don't do a replace if the drop happened inside of the selected text.
+      if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
+        cm.state.draggingText(e);
+        // Ensure the editor is re-focused
+        setTimeout(function () { return cm.display.input.focus(); }, 20);
+        return
+      }
+      try {
+        var text$1 = e.dataTransfer.getData("Text");
+        if (text$1) {
+          var selected;
+          if (cm.state.draggingText && !cm.state.draggingText.copy)
+            { selected = cm.listSelections(); }
+          setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
+          if (selected) { for (var i$1 = 0; i$1 < selected.length; ++i$1)
+            { replaceRange(cm.doc, "", selected[i$1].anchor, selected[i$1].head, "drag"); } }
+          cm.replaceSelection(text$1, "around", "paste");
+          cm.display.input.focus();
+        }
+      }
+      catch(e){}
+    }
+  }
+
+  function onDragStart(cm, e) {
+    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return }
+    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { return }
+
+    e.dataTransfer.setData("Text", cm.getSelection());
+    e.dataTransfer.effectAllowed = "copyMove";
+
+    // Use dummy image instead of default browsers image.
+    // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
+    if (e.dataTransfer.setDragImage && !safari) {
+      var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
+      img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
+      if (presto) {
+        img.width = img.height = 1;
+        cm.display.wrapper.appendChild(img);
+        // Force a relayout, or Opera won't use our image for some obscure reason
+        img._top = img.offsetTop;
+      }
+      e.dataTransfer.setDragImage(img, 0, 0);
+      if (presto) { img.parentNode.removeChild(img); }
+    }
+  }
+
+  function onDragOver(cm, e) {
+    var pos = posFromMouse(cm, e);
+    if (!pos) { return }
+    var frag = document.createDocumentFragment();
+    drawSelectionCursor(cm, pos, frag);
+    if (!cm.display.dragCursor) {
+      cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
+      cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+    }
+    removeChildrenAndAdd(cm.display.dragCursor, frag);
+  }
+
+  function clearDragCursor(cm) {
+    if (cm.display.dragCursor) {
+      cm.display.lineSpace.removeChild(cm.display.dragCursor);
+      cm.display.dragCursor = null;
+    }
+  }
+
+  // These must be handled carefully, because naively registering a
+  // handler for each editor will cause the editors to never be
+  // garbage collected.
+
+  function forEachCodeMirror(f) {
+    if (!document.getElementsByClassName) { return }
+    var byClass = document.getElementsByClassName("CodeMirror"), editors = [];
+    for (var i = 0; i < byClass.length; i++) {
+      var cm = byClass[i].CodeMirror;
+      if (cm) { editors.push(cm); }
+    }
+    if (editors.length) { editors[0].operation(function () {
+      for (var i = 0; i < editors.length; i++) { f(editors[i]); }
+    }); }
+  }
+
+  var globalsRegistered = false;
+  function ensureGlobalHandlers() {
+    if (globalsRegistered) { return }
+    registerGlobalHandlers();
+    globalsRegistered = true;
+  }
+  function registerGlobalHandlers() {
+    // When the window resizes, we need to refresh active editors.
+    var resizeTimer;
+    on(window, "resize", function () {
+      if (resizeTimer == null) { resizeTimer = setTimeout(function () {
+        resizeTimer = null;
+        forEachCodeMirror(onResize);
+      }, 100); }
+    });
+    // When the window loses focus, we want to show the editor as blurred
+    on(window, "blur", function () { return forEachCodeMirror(onBlur); });
+  }
+  // Called when the window resizes
+  function onResize(cm) {
+    var d = cm.display;
+    // Might be a text scaling operation, clear size caches.
+    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+    d.scrollbarsClipped = false;
+    cm.setSize();
+  }
+
+  var keyNames = {
+    3: "Pause", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+    19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
+    36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
+    46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
+    106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 145: "ScrollLock",
+    173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
+    221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+    63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
+  };
+
+  // Number keys
+  for (var i = 0; i < 10; i++) { keyNames[i + 48] = keyNames[i + 96] = String(i); }
+  // Alphabetic keys
+  for (var i$1 = 65; i$1 <= 90; i$1++) { keyNames[i$1] = String.fromCharCode(i$1); }
+  // Function keys
+  for (var i$2 = 1; i$2 <= 12; i$2++) { keyNames[i$2 + 111] = keyNames[i$2 + 63235] = "F" + i$2; }
+
+  var keyMap = {};
+
+  keyMap.basic = {
+    "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
+    "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
+    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
+    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
+    "Esc": "singleSelection"
+  };
+  // Note that the save and find-related commands aren't defined by
+  // default. User code or addons can define them. Unknown commands
+  // are simply ignored.
+  keyMap.pcDefault = {
+    "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
+    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
+    "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
+    "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
+    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
+    "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
+    "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
+    "fallthrough": "basic"
+  };
+  // Very basic readline/emacs-style bindings, which are standard on Mac.
+  keyMap.emacsy = {
+    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
+    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
+    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
+    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
+    "Ctrl-O": "openLine"
+  };
+  keyMap.macDefault = {
+    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
+    "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
+    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
+    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
+    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
+    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
+    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
+    "fallthrough": ["basic", "emacsy"]
+  };
+  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
+
+  // KEYMAP DISPATCH
+
+  function normalizeKeyName(name) {
+    var parts = name.split(/-(?!$)/);
+    name = parts[parts.length - 1];
+    var alt, ctrl, shift, cmd;
+    for (var i = 0; i < parts.length - 1; i++) {
+      var mod = parts[i];
+      if (/^(cmd|meta|m)$/i.test(mod)) { cmd = true; }
+      else if (/^a(lt)?$/i.test(mod)) { alt = true; }
+      else if (/^(c|ctrl|control)$/i.test(mod)) { ctrl = true; }
+      else if (/^s(hift)?$/i.test(mod)) { shift = true; }
+      else { throw new Error("Unrecognized modifier name: " + mod) }
+    }
+    if (alt) { name = "Alt-" + name; }
+    if (ctrl) { name = "Ctrl-" + name; }
+    if (cmd) { name = "Cmd-" + name; }
+    if (shift) { name = "Shift-" + name; }
+    return name
+  }
+
+  // This is a kludge to keep keymaps mostly working as raw objects
+  // (backwards compatibility) while at the same time support features
+  // like normalization and multi-stroke key bindings. It compiles a
+  // new normalized keymap, and then updates the old object to reflect
+  // this.
+  function normalizeKeyMap(keymap) {
+    var copy = {};
+    for (var keyname in keymap) { if (keymap.hasOwnProperty(keyname)) {
+      var value = keymap[keyname];
+      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) { continue }
+      if (value == "...") { delete keymap[keyname]; continue }
+
+      var keys = map(keyname.split(" "), normalizeKeyName);
+      for (var i = 0; i < keys.length; i++) {
+        var val = (void 0), name = (void 0);
+        if (i == keys.length - 1) {
+          name = keys.join(" ");
+          val = value;
+        } else {
+          name = keys.slice(0, i + 1).join(" ");
+          val = "...";
+        }
+        var prev = copy[name];
+        if (!prev) { copy[name] = val; }
+        else if (prev != val) { throw new Error("Inconsistent bindings for " + name) }
+      }
+      delete keymap[keyname];
+    } }
+    for (var prop in copy) { keymap[prop] = copy[prop]; }
+    return keymap
+  }
+
+  function lookupKey(key, map$$1, handle, context) {
+    map$$1 = getKeyMap(map$$1);
+    var found = map$$1.call ? map$$1.call(key, context) : map$$1[key];
+    if (found === false) { return "nothing" }
+    if (found === "...") { return "multi" }
+    if (found != null && handle(found)) { return "handled" }
+
+    if (map$$1.fallthrough) {
+      if (Object.prototype.toString.call(map$$1.fallthrough) != "[object Array]")
+        { return lookupKey(key, map$$1.fallthrough, handle, context) }
+      for (var i = 0; i < map$$1.fallthrough.length; i++) {
+        var result = lookupKey(key, map$$1.fallthrough[i], handle, context);
+        if (result) { return result }
+      }
+    }
+  }
+
+  // Modifier key presses don't count as 'real' key presses for the
+  // purpose of keymap fallthrough.
+  function isModifierKey(value) {
+    var name = typeof value == "string" ? value : keyNames[value.keyCode];
+    return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
+  }
+
+  function addModifierNames(name, event, noShift) {
+    var base = name;
+    if (event.altKey && base != "Alt") { name = "Alt-" + name; }
+    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { name = "Ctrl-" + name; }
+    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") { name = "Cmd-" + name; }
+    if (!noShift && event.shiftKey && base != "Shift") { name = "Shift-" + name; }
+    return name
+  }
+
+  // Look up the name of a key as indicated by an event object.
+  function keyName(event, noShift) {
+    if (presto && event.keyCode == 34 && event["char"]) { return false }
+    var name = keyNames[event.keyCode];
+    if (name == null || event.altGraphKey) { return false }
+    // Ctrl-ScrollLock has keyCode 3, same as Ctrl-Pause,
+    // so we'll use event.code when available (Chrome 48+, FF 38+, Safari 10.1+)
+    if (event.keyCode == 3 && event.code) { name = event.code; }
+    return addModifierNames(name, event, noShift)
+  }
+
+  function getKeyMap(val) {
+    return typeof val == "string" ? keyMap[val] : val
+  }
+
+  // Helper for deleting text near the selection(s), used to implement
+  // backspace, delete, and similar functionality.
+  function deleteNearSelection(cm, compute) {
+    var ranges = cm.doc.sel.ranges, kill = [];
+    // Build up a set of ranges to kill first, merging overlapping
+    // ranges.
+    for (var i = 0; i < ranges.length; i++) {
+      var toKill = compute(ranges[i]);
+      while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
+        var replaced = kill.pop();
+        if (cmp(replaced.from, toKill.from) < 0) {
+          toKill.from = replaced.from;
+          break
+        }
+      }
+      kill.push(toKill);
+    }
+    // Next, remove those actual ranges.
+    runInOp(cm, function () {
+      for (var i = kill.length - 1; i >= 0; i--)
+        { replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete"); }
+      ensureCursorVisible(cm);
+    });
+  }
+
+  function moveCharLogically(line, ch, dir) {
+    var target = skipExtendingChars(line.text, ch + dir, dir);
+    return target < 0 || target > line.text.length ? null : target
+  }
+
+  function moveLogically(line, start, dir) {
+    var ch = moveCharLogically(line, start.ch, dir);
+    return ch == null ? null : new Pos(start.line, ch, dir < 0 ? "after" : "before")
+  }
+
+  function endOfLine(visually, cm, lineObj, lineNo, dir) {
+    if (visually) {
+      var order = getOrder(lineObj, cm.doc.direction);
+      if (order) {
+        var part = dir < 0 ? lst(order) : order[0];
+        var moveInStorageOrder = (dir < 0) == (part.level == 1);
+        var sticky = moveInStorageOrder ? "after" : "before";
+        var ch;
+        // With a wrapped rtl chunk (possibly spanning multiple bidi parts),
+        // it could be that the last bidi part is not on the last visual line,
+        // since visual lines contain content order-consecutive chunks.
+        // Thus, in rtl, we are looking for the first (content-order) character
+        // in the rtl chunk that is on the last line (that is, the same line
+        // as the last (content-order) character).
+        if (part.level > 0 || cm.doc.direction == "rtl") {
+          var prep = prepareMeasureForLine(cm, lineObj);
+          ch = dir < 0 ? lineObj.text.length - 1 : 0;
+          var targetTop = measureCharPrepared(cm, prep, ch).top;
+          ch = findFirst(function (ch) { return measureCharPrepared(cm, prep, ch).top == targetTop; }, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch);
+          if (sticky == "before") { ch = moveCharLogically(lineObj, ch, 1); }
+        } else { ch = dir < 0 ? part.to : part.from; }
+        return new Pos(lineNo, ch, sticky)
+      }
+    }
+    return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after")
+  }
+
+  function moveVisually(cm, line, start, dir) {
+    var bidi = getOrder(line, cm.doc.direction);
+    if (!bidi) { return moveLogically(line, start, dir) }
+    if (start.ch >= line.text.length) {
+      start.ch = line.text.length;
+      start.sticky = "before";
+    } else if (start.ch <= 0) {
+      start.ch = 0;
+      start.sticky = "after";
+    }
+    var partPos = getBidiPartAt(bidi, start.ch, start.sticky), part = bidi[partPos];
+    if (cm.doc.direction == "ltr" && part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) {
+      // Case 1: We move within an ltr part in an ltr editor. Even with wrapped lines,
+      // nothing interesting happens.
+      return moveLogically(line, start, dir)
+    }
+
+    var mv = function (pos, dir) { return moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir); };
+    var prep;
+    var getWrappedLineExtent = function (ch) {
+      if (!cm.options.lineWrapping) { return {begin: 0, end: line.text.length} }
+      prep = prep || prepareMeasureForLine(cm, line);
+      return wrappedLineExtentChar(cm, line, prep, ch)
+    };
+    var wrappedLineExtent = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch);
+
+    if (cm.doc.direction == "rtl" || part.level == 1) {
+      var moveInStorageOrder = (part.level == 1) == (dir < 0);
+      var ch = mv(start, moveInStorageOrder ? 1 : -1);
+      if (ch != null && (!moveInStorageOrder ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) {
+        // Case 2: We move within an rtl part or in an rtl editor on the same visual line
+        var sticky = moveInStorageOrder ? "before" : "after";
+        return new Pos(start.line, ch, sticky)
+      }
+    }
+
+    // Case 3: Could not move within this bidi part in this visual line, so leave
+    // the current bidi part
+
+    var searchInVisualLine = function (partPos, dir, wrappedLineExtent) {
+      var getRes = function (ch, moveInStorageOrder) { return moveInStorageOrder
+        ? new Pos(start.line, mv(ch, 1), "before")
+        : new Pos(start.line, ch, "after"); };
+
+      for (; partPos >= 0 && partPos < bidi.length; partPos += dir) {
+        var part = bidi[partPos];
+        var moveInStorageOrder = (dir > 0) == (part.level != 1);
+        var ch = moveInStorageOrder ? wrappedLineExtent.begin : mv(wrappedLineExtent.end, -1);
+        if (part.from <= ch && ch < part.to) { return getRes(ch, moveInStorageOrder) }
+        ch = moveInStorageOrder ? part.from : mv(part.to, -1);
+        if (wrappedLineExtent.begin <= ch && ch < wrappedLineExtent.end) { return getRes(ch, moveInStorageOrder) }
+      }
+    };
+
+    // Case 3a: Look for other bidi parts on the same visual line
+    var res = searchInVisualLine(partPos + dir, dir, wrappedLineExtent);
+    if (res) { return res }
+
+    // Case 3b: Look for other bidi parts on the next visual line
+    var nextCh = dir > 0 ? wrappedLineExtent.end : mv(wrappedLineExtent.begin, -1);
+    if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) {
+      res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getWrappedLineExtent(nextCh));
+      if (res) { return res }
+    }
+
+    // Case 4: Nowhere to move
+    return null
+  }
+
+  // Commands are parameter-less actions that can be performed on an
+  // editor, mostly used for keybindings.
+  var commands = {
+    selectAll: selectAll,
+    singleSelection: function (cm) { return cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); },
+    killLine: function (cm) { return deleteNearSelection(cm, function (range) {
+      if (range.empty()) {
+        var len = getLine(cm.doc, range.head.line).text.length;
+        if (range.head.ch == len && range.head.line < cm.lastLine())
+          { return {from: range.head, to: Pos(range.head.line + 1, 0)} }
+        else
+          { return {from: range.head, to: Pos(range.head.line, len)} }
+      } else {
+        return {from: range.from(), to: range.to()}
+      }
+    }); },
+    deleteLine: function (cm) { return deleteNearSelection(cm, function (range) { return ({
+      from: Pos(range.from().line, 0),
+      to: clipPos(cm.doc, Pos(range.to().line + 1, 0))
+    }); }); },
+    delLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { return ({
+      from: Pos(range.from().line, 0), to: range.from()
+    }); }); },
+    delWrappedLineLeft: function (cm) { return deleteNearSelection(cm, function (range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      var leftPos = cm.coordsChar({left: 0, top: top}, "div");
+      return {from: leftPos, to: range.from()}
+    }); },
+    delWrappedLineRight: function (cm) { return deleteNearSelection(cm, function (range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+      return {from: range.from(), to: rightPos }
+    }); },
+    undo: function (cm) { return cm.undo(); },
+    redo: function (cm) { return cm.redo(); },
+    undoSelection: function (cm) { return cm.undoSelection(); },
+    redoSelection: function (cm) { return cm.redoSelection(); },
+    goDocStart: function (cm) { return cm.extendSelection(Pos(cm.firstLine(), 0)); },
+    goDocEnd: function (cm) { return cm.extendSelection(Pos(cm.lastLine())); },
+    goLineStart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStart(cm, range.head.line); },
+      {origin: "+move", bias: 1}
+    ); },
+    goLineStartSmart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStartSmart(cm, range.head); },
+      {origin: "+move", bias: 1}
+    ); },
+    goLineEnd: function (cm) { return cm.extendSelectionsBy(function (range) { return lineEnd(cm, range.head.line); },
+      {origin: "+move", bias: -1}
+    ); },
+    goLineRight: function (cm) { return cm.extendSelectionsBy(function (range) {
+      var top = cm.cursorCoords(range.head, "div").top + 5;
+      return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
+    }, sel_move); },
+    goLineLeft: function (cm) { return cm.extendSelectionsBy(function (range) {
+      var top = cm.cursorCoords(range.head, "div").top + 5;
+      return cm.coordsChar({left: 0, top: top}, "div")
+    }, sel_move); },
+    goLineLeftSmart: function (cm) { return cm.extendSelectionsBy(function (range) {
+      var top = cm.cursorCoords(range.head, "div").top + 5;
+      var pos = cm.coordsChar({left: 0, top: top}, "div");
+      if (pos.ch < cm.getLine(pos.line).search(/\S/)) { return lineStartSmart(cm, range.head) }
+      return pos
+    }, sel_move); },
+    goLineUp: function (cm) { return cm.moveV(-1, "line"); },
+    goLineDown: function (cm) { return cm.moveV(1, "line"); },
+    goPageUp: function (cm) { return cm.moveV(-1, "page"); },
+    goPageDown: function (cm) { return cm.moveV(1, "page"); },
+    goCharLeft: function (cm) { return cm.moveH(-1, "char"); },
+    goCharRight: function (cm) { return cm.moveH(1, "char"); },
+    goColumnLeft: function (cm) { return cm.moveH(-1, "column"); },
+    goColumnRight: function (cm) { return cm.moveH(1, "column"); },
+    goWordLeft: function (cm) { return cm.moveH(-1, "word"); },
+    goGroupRight: function (cm) { return cm.moveH(1, "group"); },
+    goGroupLeft: function (cm) { return cm.moveH(-1, "group"); },
+    goWordRight: function (cm) { return cm.moveH(1, "word"); },
+    delCharBefore: function (cm) { return cm.deleteH(-1, "char"); },
+    delCharAfter: function (cm) { return cm.deleteH(1, "char"); },
+    delWordBefore: function (cm) { return cm.deleteH(-1, "word"); },
+    delWordAfter: function (cm) { return cm.deleteH(1, "word"); },
+    delGroupBefore: function (cm) { return cm.deleteH(-1, "group"); },
+    delGroupAfter: function (cm) { return cm.deleteH(1, "group"); },
+    indentAuto: function (cm) { return cm.indentSelection("smart"); },
+    indentMore: function (cm) { return cm.indentSelection("add"); },
+    indentLess: function (cm) { return cm.indentSelection("subtract"); },
+    insertTab: function (cm) { return cm.replaceSelection("\t"); },
+    insertSoftTab: function (cm) {
+      var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
+      for (var i = 0; i < ranges.length; i++) {
+        var pos = ranges[i].from();
+        var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
+        spaces.push(spaceStr(tabSize - col % tabSize));
+      }
+      cm.replaceSelections(spaces);
+    },
+    defaultTab: function (cm) {
+      if (cm.somethingSelected()) { cm.indentSelection("add"); }
+      else { cm.execCommand("insertTab"); }
+    },
+    // Swap the two chars left and right of each selection's head.
+    // Move cursor behind the two swapped characters afterwards.
+    //
+    // Doesn't consider line feeds a character.
+    // Doesn't scan more than one line above to find a character.
+    // Doesn't do anything on an empty line.
+    // Doesn't do anything with non-empty selections.
+    transposeChars: function (cm) { return runInOp(cm, function () {
+      var ranges = cm.listSelections(), newSel = [];
+      for (var i = 0; i < ranges.length; i++) {
+        if (!ranges[i].empty()) { continue }
+        var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
+        if (line) {
+          if (cur.ch == line.length) { cur = new Pos(cur.line, cur.ch - 1); }
+          if (cur.ch > 0) {
+            cur = new Pos(cur.line, cur.ch + 1);
+            cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
+                            Pos(cur.line, cur.ch - 2), cur, "+transpose");
+          } else if (cur.line > cm.doc.first) {
+            var prev = getLine(cm.doc, cur.line - 1).text;
+            if (prev) {
+              cur = new Pos(cur.line, 1);
+              cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
+                              prev.charAt(prev.length - 1),
+                              Pos(cur.line - 1, prev.length - 1), cur, "+transpose");
+            }
+          }
+        }
+        newSel.push(new Range(cur, cur));
+      }
+      cm.setSelections(newSel);
+    }); },
+    newlineAndIndent: function (cm) { return runInOp(cm, function () {
+      var sels = cm.listSelections();
+      for (var i = sels.length - 1; i >= 0; i--)
+        { cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input"); }
+      sels = cm.listSelections();
+      for (var i$1 = 0; i$1 < sels.length; i$1++)
+        { cm.indentLine(sels[i$1].from().line, null, true); }
+      ensureCursorVisible(cm);
+    }); },
+    openLine: function (cm) { return cm.replaceSelection("\n", "start"); },
+    toggleOverwrite: function (cm) { return cm.toggleOverwrite(); }
+  };
+
+
+  function lineStart(cm, lineN) {
+    var line = getLine(cm.doc, lineN);
+    var visual = visualLine(line);
+    if (visual != line) { lineN = lineNo(visual); }
+    return endOfLine(true, cm, visual, lineN, 1)
+  }
+  function lineEnd(cm, lineN) {
+    var line = getLine(cm.doc, lineN);
+    var visual = visualLineEnd(line);
+    if (visual != line) { lineN = lineNo(visual); }
+    return endOfLine(true, cm, line, lineN, -1)
+  }
+  function lineStartSmart(cm, pos) {
+    var start = lineStart(cm, pos.line);
+    var line = getLine(cm.doc, start.line);
+    var order = getOrder(line, cm.doc.direction);
+    if (!order || order[0].level == 0) {
+      var firstNonWS = Math.max(0, line.text.search(/\S/));
+      var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
+      return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
+    }
+    return start
+  }
+
+  // Run a handler that was bound to a key.
+  function doHandleBinding(cm, bound, dropShift) {
+    if (typeof bound == "string") {
+      bound = commands[bound];
+      if (!bound) { return false }
+    }
+    // Ensure previous input has been read, so that the handler sees a
+    // consistent view of the document
+    cm.display.input.ensurePolled();
+    var prevShift = cm.display.shift, done = false;
+    try {
+      if (cm.isReadOnly()) { cm.state.suppressEdits = true; }
+      if (dropShift) { cm.display.shift = false; }
+      done = bound(cm) != Pass;
+    } finally {
+      cm.display.shift = prevShift;
+      cm.state.suppressEdits = false;
+    }
+    return done
+  }
+
+  function lookupKeyForEditor(cm, name, handle) {
+    for (var i = 0; i < cm.state.keyMaps.length; i++) {
+      var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
+      if (result) { return result }
+    }
+    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
+      || lookupKey(name, cm.options.keyMap, handle, cm)
+  }
+
+  // Note that, despite the name, this function is also used to check
+  // for bound mouse clicks.
+
+  var stopSeq = new Delayed;
+
+  function dispatchKey(cm, name, e, handle) {
+    var seq = cm.state.keySeq;
+    if (seq) {
+      if (isModifierKey(name)) { return "handled" }
+      if (/\'$/.test(name))
+        { cm.state.keySeq = null; }
+      else
+        { stopSeq.set(50, function () {
+          if (cm.state.keySeq == seq) {
+            cm.state.keySeq = null;
+            cm.display.input.reset();
+          }
+        }); }
+      if (dispatchKeyInner(cm, seq + " " + name, e, handle)) { return true }
+    }
+    return dispatchKeyInner(cm, name, e, handle)
+  }
+
+  function dispatchKeyInner(cm, name, e, handle) {
+    var result = lookupKeyForEditor(cm, name, handle);
+
+    if (result == "multi")
+      { cm.state.keySeq = name; }
+    if (result == "handled")
+      { signalLater(cm, "keyHandled", cm, name, e); }
+
+    if (result == "handled" || result == "multi") {
+      e_preventDefault(e);
+      restartBlink(cm);
+    }
+
+    return !!result
+  }
+
+  // Handle a key from the keydown event.
+  function handleKeyBinding(cm, e) {
+    var name = keyName(e, true);
+    if (!name) { return false }
+
+    if (e.shiftKey && !cm.state.keySeq) {
+      // First try to resolve full name (including 'Shift-'). Failing
+      // that, see if there is a cursor-motion command (starting with
+      // 'go') bound to the keyname without 'Shift-'.
+      return dispatchKey(cm, "Shift-" + name, e, function (b) { return doHandleBinding(cm, b, true); })
+          || dispatchKey(cm, name, e, function (b) {
+               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+                 { return doHandleBinding(cm, b) }
+             })
+    } else {
+      return dispatchKey(cm, name, e, function (b) { return doHandleBinding(cm, b); })
+    }
+  }
+
+  // Handle a key from the keypress event
+  function handleCharBinding(cm, e, ch) {
+    return dispatchKey(cm, "'" + ch + "'", e, function (b) { return doHandleBinding(cm, b, true); })
+  }
+
+  var lastStoppedKey = null;
+  function onKeyDown(e) {
+    var cm = this;
+    cm.curOp.focus = activeElt();
+    if (signalDOMEvent(cm, e)) { return }
+    // IE does strange things with escape.
+    if (ie && ie_version < 11 && e.keyCode == 27) { e.returnValue = false; }
+    var code = e.keyCode;
+    cm.display.shift = code == 16 || e.shiftKey;
+    var handled = handleKeyBinding(cm, e);
+    if (presto) {
+      lastStoppedKey = handled ? code : null;
+      // Opera has no cut event... we try to at least catch the key combo
+      if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
+        { cm.replaceSelection("", null, "cut"); }
+    }
+    if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand)
+      { document.execCommand("cut"); }
+
+    // Turn mouse into crosshair when Alt is held on Mac.
+    if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
+      { showCrossHair(cm); }
+  }
+
+  function showCrossHair(cm) {
+    var lineDiv = cm.display.lineDiv;
+    addClass(lineDiv, "CodeMirror-crosshair");
+
+    function up(e) {
+      if (e.keyCode == 18 || !e.altKey) {
+        rmClass(lineDiv, "CodeMirror-crosshair");
+        off(document, "keyup", up);
+        off(document, "mouseover", up);
+      }
+    }
+    on(document, "keyup", up);
+    on(document, "mouseover", up);
+  }
+
+  function onKeyUp(e) {
+    if (e.keyCode == 16) { this.doc.sel.shift = false; }
+    signalDOMEvent(this, e);
+  }
+
+  function onKeyPress(e) {
+    var cm = this;
+    if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { return }
+    var keyCode = e.keyCode, charCode = e.charCode;
+    if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
+    if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) { return }
+    var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
+    // Some browsers fire keypress events for backspace
+    if (ch == "\x08") { return }
+    if (handleCharBinding(cm, e, ch)) { return }
+    cm.display.input.onKeyPress(e);
+  }
+
+  var DOUBLECLICK_DELAY = 400;
+
+  var PastClick = function(time, pos, button) {
+    this.time = time;
+    this.pos = pos;
+    this.button = button;
+  };
+
+  PastClick.prototype.compare = function (time, pos, button) {
+    return this.time + DOUBLECLICK_DELAY > time &&
+      cmp(pos, this.pos) == 0 && button == this.button
+  };
+
+  var lastClick, lastDoubleClick;
+  function clickRepeat(pos, button) {
+    var now = +new Date;
+    if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) {
+      lastClick = lastDoubleClick = null;
+      return "triple"
+    } else if (lastClick && lastClick.compare(now, pos, button)) {
+      lastDoubleClick = new PastClick(now, pos, button);
+      lastClick = null;
+      return "double"
+    } else {
+      lastClick = new PastClick(now, pos, button);
+      lastDoubleClick = null;
+      return "single"
+    }
+  }
+
+  // A mouse down can be a single click, double click, triple click,
+  // start of selection drag, start of text drag, new cursor
+  // (ctrl-click), rectangle drag (alt-drag), or xwin
+  // middle-click-paste. Or it might be a click on something we should
+  // not interfere with, such as a scrollbar or widget.
+  function onMouseDown(e) {
+    var cm = this, display = cm.display;
+    if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) { return }
+    display.input.ensurePolled();
+    display.shift = e.shiftKey;
+
+    if (eventInWidget(display, e)) {
+      if (!webkit) {
+        // Briefly turn off draggability, to allow widgets to do
+        // normal dragging things.
+        display.scroller.draggable = false;
+        setTimeout(function () { return display.scroller.draggable = true; }, 100);
+      }
+      return
+    }
+    if (clickInGutter(cm, e)) { return }
+    var pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single";
+    window.focus();
+
+    // #3261: make sure, that we're not starting a second selection
+    if (button == 1 && cm.state.selectingText)
+      { cm.state.selectingText(e); }
+
+    if (pos && handleMappedButton(cm, button, pos, repeat, e)) { return }
+
+    if (button == 1) {
+      if (pos) { leftButtonDown(cm, pos, repeat, e); }
+      else if (e_target(e) == display.scroller) { e_preventDefault(e); }
+    } else if (button == 2) {
+      if (pos) { extendSelection(cm.doc, pos); }
+      setTimeout(function () { return display.input.focus(); }, 20);
+    } else if (button == 3) {
+      if (captureRightClick) { cm.display.input.onContextMenu(e); }
+      else { delayBlurEvent(cm); }
+    }
+  }
+
+  function handleMappedButton(cm, button, pos, repeat, event) {
+    var name = "Click";
+    if (repeat == "double") { name = "Double" + name; }
+    else if (repeat == "triple") { name = "Triple" + name; }
+    name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name;
+
+    return dispatchKey(cm,  addModifierNames(name, event), event, function (bound) {
+      if (typeof bound == "string") { bound = commands[bound]; }
+      if (!bound) { return false }
+      var done = false;
+      try {
+        if (cm.isReadOnly()) { cm.state.suppressEdits = true; }
+        done = bound(cm, pos) != Pass;
+      } finally {
+        cm.state.suppressEdits = false;
+      }
+      return done
+    })
+  }
+
+  function configureMouse(cm, repeat, event) {
+    var option = cm.getOption("configureMouse");
+    var value = option ? option(cm, repeat, event) : {};
+    if (value.unit == null) {
+      var rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey;
+      value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line";
+    }
+    if (value.extend == null || cm.doc.extend) { value.extend = cm.doc.extend || event.shiftKey; }
+    if (value.addNew == null) { value.addNew = mac ? event.metaKey : event.ctrlKey; }
+    if (value.moveOnDrag == null) { value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey); }
+    return value
+  }
+
+  function leftButtonDown(cm, pos, repeat, event) {
+    if (ie) { setTimeout(bind(ensureFocus, cm), 0); }
+    else { cm.curOp.focus = activeElt(); }
+
+    var behavior = configureMouse(cm, repeat, event);
+
+    var sel = cm.doc.sel, contained;
+    if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
+        repeat == "single" && (contained = sel.contains(pos)) > -1 &&
+        (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) &&
+        (cmp(contained.to(), pos) > 0 || pos.xRel < 0))
+      { leftButtonStartDrag(cm, event, pos, behavior); }
+    else
+      { leftButtonSelect(cm, event, pos, behavior); }
+  }
+
+  // Start a text drag. When it ends, see if any dragging actually
+  // happen, and treat as a click if it didn't.
+  function leftButtonStartDrag(cm, event, pos, behavior) {
+    var display = cm.display, moved = false;
+    var dragEnd = operation(cm, function (e) {
+      if (webkit) { display.scroller.draggable = false; }
+      cm.state.draggingText = false;
+      off(display.wrapper.ownerDocument, "mouseup", dragEnd);
+      off(display.wrapper.ownerDocument, "mousemove", mouseMove);
+      off(display.scroller, "dragstart", dragStart);
+      off(display.scroller, "drop", dragEnd);
+      if (!moved) {
+        e_preventDefault(e);
+        if (!behavior.addNew)
+          { extendSelection(cm.doc, pos, null, null, behavior.extend); }
+        // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
+        if (webkit || ie && ie_version == 9)
+          { setTimeout(function () {display.wrapper.ownerDocument.body.focus(); display.input.focus();}, 20); }
+        else
+          { display.input.focus(); }
+      }
+    });
+    var mouseMove = function(e2) {
+      moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10;
+    };
+    var dragStart = function () { return moved = true; };
+    // Let the drag handler handle this.
+    if (webkit) { display.scroller.draggable = true; }
+    cm.state.draggingText = dragEnd;
+    dragEnd.copy = !behavior.moveOnDrag;
+    // IE's approach to draggable
+    if (display.scroller.dragDrop) { display.scroller.dragDrop(); }
+    on(display.wrapper.ownerDocument, "mouseup", dragEnd);
+    on(display.wrapper.ownerDocument, "mousemove", mouseMove);
+    on(display.scroller, "dragstart", dragStart);
+    on(display.scroller, "drop", dragEnd);
+
+    delayBlurEvent(cm);
+    setTimeout(function () { return display.input.focus(); }, 20);
+  }
+
+  function rangeForUnit(cm, pos, unit) {
+    if (unit == "char") { return new Range(pos, pos) }
+    if (unit == "word") { return cm.findWordAt(pos) }
+    if (unit == "line") { return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))) }
+    var result = unit(cm, pos);
+    return new Range(result.from, result.to)
+  }
+
+  // Normal selection, as opposed to text dragging.
+  function leftButtonSelect(cm, event, start, behavior) {
+    var display = cm.display, doc = cm.doc;
+    e_preventDefault(event);
+
+    var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
+    if (behavior.addNew && !behavior.extend) {
+      ourIndex = doc.sel.contains(start);
+      if (ourIndex > -1)
+        { ourRange = ranges[ourIndex]; }
+      else
+        { ourRange = new Range(start, start); }
+    } else {
+      ourRange = doc.sel.primary();
+      ourIndex = doc.sel.primIndex;
+    }
+
+    if (behavior.unit == "rectangle") {
+      if (!behavior.addNew) { ourRange = new Range(start, start); }
+      start = posFromMouse(cm, event, true, true);
+      ourIndex = -1;
+    } else {
+      var range$$1 = rangeForUnit(cm, start, behavior.unit);
+      if (behavior.extend)
+        { ourRange = extendRange(ourRange, range$$1.anchor, range$$1.head, behavior.extend); }
+      else
+        { ourRange = range$$1; }
+    }
+
+    if (!behavior.addNew) {
+      ourIndex = 0;
+      setSelection(doc, new Selection([ourRange], 0), sel_mouse);
+      startSel = doc.sel;
+    } else if (ourIndex == -1) {
+      ourIndex = ranges.length;
+      setSelection(doc, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex),
+                   {scroll: false, origin: "*mouse"});
+    } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {
+      setSelection(doc, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+                   {scroll: false, origin: "*mouse"});
+      startSel = doc.sel;
+    } else {
+      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
+    }
+
+    var lastPos = start;
+    function extendTo(pos) {
+      if (cmp(lastPos, pos) == 0) { return }
+      lastPos = pos;
+
+      if (behavior.unit == "rectangle") {
+        var ranges = [], tabSize = cm.options.tabSize;
+        var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
+        var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
+        var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
+        for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
+             line <= end; line++) {
+          var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
+          if (left == right)
+            { ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); }
+          else if (text.length > leftPos)
+            { ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); }
+        }
+        if (!ranges.length) { ranges.push(new Range(start, start)); }
+        setSelection(doc, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
+                     {origin: "*mouse", scroll: false});
+        cm.scrollIntoView(pos);
+      } else {
+        var oldRange = ourRange;
+        var range$$1 = rangeForUnit(cm, pos, behavior.unit);
+        var anchor = oldRange.anchor, head;
+        if (cmp(range$$1.anchor, anchor) > 0) {
+          head = range$$1.head;
+          anchor = minPos(oldRange.from(), range$$1.anchor);
+        } else {
+          head = range$$1.anchor;
+          anchor = maxPos(oldRange.to(), range$$1.head);
+        }
+        var ranges$1 = startSel.ranges.slice(0);
+        ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head));
+        setSelection(doc, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse);
+      }
+    }
+
+    var editorSize = display.wrapper.getBoundingClientRect();
+    // Used to ensure timeout re-tries don't fire when another extend
+    // happened in the meantime (clearTimeout isn't reliable -- at
+    // least on Chrome, the timeouts still happen even when cleared,
+    // if the clear happens after their scheduled firing time).
+    var counter = 0;
+
+    function extend(e) {
+      var curCount = ++counter;
+      var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle");
+      if (!cur) { return }
+      if (cmp(cur, lastPos) != 0) {
+        cm.curOp.focus = activeElt();
+        extendTo(cur);
+        var visible = visibleLines(display, doc);
+        if (cur.line >= visible.to || cur.line < visible.from)
+          { setTimeout(operation(cm, function () {if (counter == curCount) { extend(e); }}), 150); }
+      } else {
+        var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
+        if (outside) { setTimeout(operation(cm, function () {
+          if (counter != curCount) { return }
+          display.scroller.scrollTop += outside;
+          extend(e);
+        }), 50); }
+      }
+    }
+
+    function done(e) {
+      cm.state.selectingText = false;
+      counter = Infinity;
+      // If e is null or undefined we interpret this as someone trying
+      // to explicitly cancel the selection rather than the user
+      // letting go of the mouse button.
+      if (e) {
+        e_preventDefault(e);
+        display.input.focus();
+      }
+      off(display.wrapper.ownerDocument, "mousemove", move);
+      off(display.wrapper.ownerDocument, "mouseup", up);
+      doc.history.lastSelOrigin = null;
+    }
+
+    var move = operation(cm, function (e) {
+      if (e.buttons === 0 || !e_button(e)) { done(e); }
+      else { extend(e); }
+    });
+    var up = operation(cm, done);
+    cm.state.selectingText = up;
+    on(display.wrapper.ownerDocument, "mousemove", move);
+    on(display.wrapper.ownerDocument, "mouseup", up);
+  }
+
+  // Used when mouse-selecting to adjust the anchor to the proper side
+  // of a bidi jump depending on the visual position of the head.
+  function bidiSimplify(cm, range$$1) {
+    var anchor = range$$1.anchor;
+    var head = range$$1.head;
+    var anchorLine = getLine(cm.doc, anchor.line);
+    if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) { return range$$1 }
+    var order = getOrder(anchorLine);
+    if (!order) { return range$$1 }
+    var index = getBidiPartAt(order, anchor.ch, anchor.sticky), part = order[index];
+    if (part.from != anchor.ch && part.to != anchor.ch) { return range$$1 }
+    var boundary = index + ((part.from == anchor.ch) == (part.level != 1) ? 0 : 1);
+    if (boundary == 0 || boundary == order.length) { return range$$1 }
+
+    // Compute the relative visual position of the head compared to the
+    // anchor (<0 is to the left, >0 to the right)
+    var leftSide;
+    if (head.line != anchor.line) {
+      leftSide = (head.line - anchor.line) * (cm.doc.direction == "ltr" ? 1 : -1) > 0;
+    } else {
+      var headIndex = getBidiPartAt(order, head.ch, head.sticky);
+      var dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1);
+      if (headIndex == boundary - 1 || headIndex == boundary)
+        { leftSide = dir < 0; }
+      else
+        { leftSide = dir > 0; }
+    }
+
+    var usePart = order[boundary + (leftSide ? -1 : 0)];
+    var from = leftSide == (usePart.level == 1);
+    var ch = from ? usePart.from : usePart.to, sticky = from ? "after" : "before";
+    return anchor.ch == ch && anchor.sticky == sticky ? range$$1 : new Range(new Pos(anchor.line, ch, sticky), head)
+  }
+
+
+  // Determines whether an event happened in the gutter, and fires the
+  // handlers for the corresponding event.
+  function gutterEvent(cm, e, type, prevent) {
+    var mX, mY;
+    if (e.touches) {
+      mX = e.touches[0].clientX;
+      mY = e.touches[0].clientY;
+    } else {
+      try { mX = e.clientX; mY = e.clientY; }
+      catch(e) { return false }
+    }
+    if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { return false }
+    if (prevent) { e_preventDefault(e); }
+
+    var display = cm.display;
+    var lineBox = display.lineDiv.getBoundingClientRect();
+
+    if (mY > lineBox.bottom || !hasHandler(cm, type)) { return e_defaultPrevented(e) }
+    mY -= lineBox.top - display.viewOffset;
+
+    for (var i = 0; i < cm.display.gutterSpecs.length; ++i) {
+      var g = display.gutters.childNodes[i];
+      if (g && g.getBoundingClientRect().right >= mX) {
+        var line = lineAtHeight(cm.doc, mY);
+        var gutter = cm.display.gutterSpecs[i];
+        signal(cm, type, cm, line, gutter.className, e);
+        return e_defaultPrevented(e)
+      }
+    }
+  }
+
+  function clickInGutter(cm, e) {
+    return gutterEvent(cm, e, "gutterClick", true)
+  }
+
+  // CONTEXT MENU HANDLING
+
+  // To make the context menu work, we need to briefly unhide the
+  // textarea (making it as unobtrusive as possible) to let the
+  // right-click take effect on it.
+  function onContextMenu(cm, e) {
+    if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) { return }
+    if (signalDOMEvent(cm, e, "contextmenu")) { return }
+    if (!captureRightClick) { cm.display.input.onContextMenu(e); }
+  }
+
+  function contextMenuInGutter(cm, e) {
+    if (!hasHandler(cm, "gutterContextMenu")) { return false }
+    return gutterEvent(cm, e, "gutterContextMenu", false)
+  }
+
+  function themeChanged(cm) {
+    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
+      cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
+    clearCaches(cm);
+  }
+
+  var Init = {toString: function(){return "CodeMirror.Init"}};
+
+  var defaults = {};
+  var optionHandlers = {};
+
+  function defineOptions(CodeMirror) {
+    var optionHandlers = CodeMirror.optionHandlers;
+
+    function option(name, deflt, handle, notOnInit) {
+      CodeMirror.defaults[name] = deflt;
+      if (handle) { optionHandlers[name] =
+        notOnInit ? function (cm, val, old) {if (old != Init) { handle(cm, val, old); }} : handle; }
+    }
+
+    CodeMirror.defineOption = option;
+
+    // Passed to option handlers when there is no old value.
+    CodeMirror.Init = Init;
+
+    // These two are, on init, called from the constructor because they
+    // have to be initialized before the editor can start at all.
+    option("value", "", function (cm, val) { return cm.setValue(val); }, true);
+    option("mode", null, function (cm, val) {
+      cm.doc.modeOption = val;
+      loadMode(cm);
+    }, true);
+
+    option("indentUnit", 2, loadMode, true);
+    option("indentWithTabs", false);
+    option("smartIndent", true);
+    option("tabSize", 4, function (cm) {
+      resetModeState(cm);
+      clearCaches(cm);
+      regChange(cm);
+    }, true);
+
+    option("lineSeparator", null, function (cm, val) {
+      cm.doc.lineSep = val;
+      if (!val) { return }
+      var newBreaks = [], lineNo = cm.doc.first;
+      cm.doc.iter(function (line) {
+        for (var pos = 0;;) {
+          var found = line.text.indexOf(val, pos);
+          if (found == -1) { break }
+          pos = found + val.length;
+          newBreaks.push(Pos(lineNo, found));
+        }
+        lineNo++;
+      });
+      for (var i = newBreaks.length - 1; i >= 0; i--)
+        { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); }
+    });
+    option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) {
+      cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
+      if (old != Init) { cm.refresh(); }
+    });
+    option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function (cm) { return cm.refresh(); }, true);
+    option("electricChars", true);
+    option("inputStyle", mobile ? "contenteditable" : "textarea", function () {
+      throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME
+    }, true);
+    option("spellcheck", false, function (cm, val) { return cm.getInputField().spellcheck = val; }, true);
+    option("autocorrect", false, function (cm, val) { return cm.getInputField().autocorrect = val; }, true);
+    option("autocapitalize", false, function (cm, val) { return cm.getInputField().autocapitalize = val; }, true);
+    option("rtlMoveVisually", !windows);
+    option("wholeLineUpdateBefore", true);
+
+    option("theme", "default", function (cm) {
+      themeChanged(cm);
+      updateGutters(cm);
+    }, true);
+    option("keyMap", "default", function (cm, val, old) {
+      var next = getKeyMap(val);
+      var prev = old != Init && getKeyMap(old);
+      if (prev && prev.detach) { prev.detach(cm, next); }
+      if (next.attach) { next.attach(cm, prev || null); }
+    });
+    option("extraKeys", null);
+    option("configureMouse", null);
+
+    option("lineWrapping", false, wrappingChanged, true);
+    option("gutters", [], function (cm, val) {
+      cm.display.gutterSpecs = getGutters(val, cm.options.lineNumbers);
+      updateGutters(cm);
+    }, true);
+    option("fixedGutter", true, function (cm, val) {
+      cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
+      cm.refresh();
+    }, true);
+    option("coverGutterNextToScrollbar", false, function (cm) { return updateScrollbars(cm); }, true);
+    option("scrollbarStyle", "native", function (cm) {
+      initScrollbars(cm);
+      updateScrollbars(cm);
+      cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
+      cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
+    }, true);
+    option("lineNumbers", false, function (cm, val) {
+      cm.display.gutterSpecs = getGutters(cm.options.gutters, val);
+      updateGutters(cm);
+    }, true);
+    option("firstLineNumber", 1, updateGutters, true);
+    option("lineNumberFormatter", function (integer) { return integer; }, updateGutters, true);
+    option("showCursorWhenSelecting", false, updateSelection, true);
+
+    option("resetSelectionOnContextMenu", true);
+    option("lineWiseCopyCut", true);
+    option("pasteLinesPerSelection", true);
+    option("selectionsMayTouch", false);
+
+    option("readOnly", false, function (cm, val) {
+      if (val == "nocursor") {
+        onBlur(cm);
+        cm.display.input.blur();
+      }
+      cm.display.input.readOnlyChanged(val);
+    });
+    option("disableInput", false, function (cm, val) {if (!val) { cm.display.input.reset(); }}, true);
+    option("dragDrop", true, dragDropChanged);
+    option("allowDropFileTypes", null);
+
+    option("cursorBlinkRate", 530);
+    option("cursorScrollMargin", 0);
+    option("cursorHeight", 1, updateSelection, true);
+    option("singleCursorHeightPerLine", true, updateSelection, true);
+    option("workTime", 100);
+    option("workDelay", 100);
+    option("flattenSpans", true, resetModeState, true);
+    option("addModeClass", false, resetModeState, true);
+    option("pollInterval", 100);
+    option("undoDepth", 200, function (cm, val) { return cm.doc.history.undoDepth = val; });
+    option("historyEventDelay", 1250);
+    option("viewportMargin", 10, function (cm) { return cm.refresh(); }, true);
+    option("maxHighlightLength", 10000, resetModeState, true);
+    option("moveInputWithCursor", true, function (cm, val) {
+      if (!val) { cm.display.input.resetPosition(); }
+    });
+
+    option("tabindex", null, function (cm, val) { return cm.display.input.getField().tabIndex = val || ""; });
+    option("autofocus", null);
+    option("direction", "ltr", function (cm, val) { return cm.doc.setDirection(val); }, true);
+    option("phrases", null);
+  }
+
+  function dragDropChanged(cm, value, old) {
+    var wasOn = old && old != Init;
+    if (!value != !wasOn) {
+      var funcs = cm.display.dragFunctions;
+      var toggle = value ? on : off;
+      toggle(cm.display.scroller, "dragstart", funcs.start);
+      toggle(cm.display.scroller, "dragenter", funcs.enter);
+      toggle(cm.display.scroller, "dragover", funcs.over);
+      toggle(cm.display.scroller, "dragleave", funcs.leave);
+      toggle(cm.display.scroller, "drop", funcs.drop);
+    }
+  }
+
+  function wrappingChanged(cm) {
+    if (cm.options.lineWrapping) {
+      addClass(cm.display.wrapper, "CodeMirror-wrap");
+      cm.display.sizer.style.minWidth = "";
+      cm.display.sizerWidth = null;
+    } else {
+      rmClass(cm.display.wrapper, "CodeMirror-wrap");
+      findMaxLine(cm);
+    }
+    estimateLineHeights(cm);
+    regChange(cm);
+    clearCaches(cm);
+    setTimeout(function () { return updateScrollbars(cm); }, 100);
+  }
+
+  // A CodeMirror instance represents an editor. This is the object
+  // that user code is usually dealing with.
+
+  function CodeMirror(place, options) {
+    var this$1 = this;
+
+    if (!(this instanceof CodeMirror)) { return new CodeMirror(place, options) }
+
+    this.options = options = options ? copyObj(options) : {};
+    // Determine effective options based on given values and defaults.
+    copyObj(defaults, options, false);
+
+    var doc = options.value;
+    if (typeof doc == "string") { doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction); }
+    else if (options.mode) { doc.modeOption = options.mode; }
+    this.doc = doc;
+
+    var input = new CodeMirror.inputStyles[options.inputStyle](this);
+    var display = this.display = new Display(place, doc, input, options);
+    display.wrapper.CodeMirror = this;
+    themeChanged(this);
+    if (options.lineWrapping)
+      { this.display.wrapper.className += " CodeMirror-wrap"; }
+    initScrollbars(this);
+
+    this.state = {
+      keyMaps: [],  // stores maps added by addKeyMap
+      overlays: [], // highlighting overlays, as added by addOverlay
+      modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
+      overwrite: false,
+      delayingBlurEvent: false,
+      focused: false,
+      suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
+      pasteIncoming: -1, cutIncoming: -1, // help recognize paste/cut edits in input.poll
+      selectingText: false,
+      draggingText: false,
+      highlight: new Delayed(), // stores highlight worker timeout
+      keySeq: null,  // Unfinished key sequence
+      specialChars: null
+    };
+
+    if (options.autofocus && !mobile) { display.input.focus(); }
+
+    // Override magic textarea content restore that IE sometimes does
+    // on our hidden textarea on reload
+    if (ie && ie_version < 11) { setTimeout(function () { return this$1.display.input.reset(true); }, 20); }
+
+    registerEventHandlers(this);
+    ensureGlobalHandlers();
+
+    startOperation(this);
+    this.curOp.forceUpdate = true;
+    attachDoc(this, doc);
+
+    if ((options.autofocus && !mobile) || this.hasFocus())
+      { setTimeout(bind(onFocus, this), 20); }
+    else
+      { onBlur(this); }
+
+    for (var opt in optionHandlers) { if (optionHandlers.hasOwnProperty(opt))
+      { optionHandlers[opt](this$1, options[opt], Init); } }
+    maybeUpdateLineNumberWidth(this);
+    if (options.finishInit) { options.finishInit(this); }
+    for (var i = 0; i < initHooks.length; ++i) { initHooks[i](this$1); }
+    endOperation(this);
+    // Suppress optimizelegibility in Webkit, since it breaks text
+    // measuring on line wrapping boundaries.
+    if (webkit && options.lineWrapping &&
+        getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
+      { display.lineDiv.style.textRendering = "auto"; }
+  }
+
+  // The default configuration options.
+  CodeMirror.defaults = defaults;
+  // Functions to run when options are changed.
+  CodeMirror.optionHandlers = optionHandlers;
+
+  // Attach the necessary event handlers when initializing the editor
+  function registerEventHandlers(cm) {
+    var d = cm.display;
+    on(d.scroller, "mousedown", operation(cm, onMouseDown));
+    // Older IE's will not fire a second mousedown for a double click
+    if (ie && ie_version < 11)
+      { on(d.scroller, "dblclick", operation(cm, function (e) {
+        if (signalDOMEvent(cm, e)) { return }
+        var pos = posFromMouse(cm, e);
+        if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) { return }
+        e_preventDefault(e);
+        var word = cm.findWordAt(pos);
+        extendSelection(cm.doc, word.anchor, word.head);
+      })); }
+    else
+      { on(d.scroller, "dblclick", function (e) { return signalDOMEvent(cm, e) || e_preventDefault(e); }); }
+    // Some browsers fire contextmenu *after* opening the menu, at
+    // which point we can't mess with it anymore. Context menu is
+    // handled in onMouseDown for these browsers.
+    on(d.scroller, "contextmenu", function (e) { return onContextMenu(cm, e); });
+
+    // Used to suppress mouse event handling when a touch happens
+    var touchFinished, prevTouch = {end: 0};
+    function finishTouch() {
+      if (d.activeTouch) {
+        touchFinished = setTimeout(function () { return d.activeTouch = null; }, 1000);
+        prevTouch = d.activeTouch;
+        prevTouch.end = +new Date;
+      }
+    }
+    function isMouseLikeTouchEvent(e) {
+      if (e.touches.length != 1) { return false }
+      var touch = e.touches[0];
+      return touch.radiusX <= 1 && touch.radiusY <= 1
+    }
+    function farAway(touch, other) {
+      if (other.left == null) { return true }
+      var dx = other.left - touch.left, dy = other.top - touch.top;
+      return dx * dx + dy * dy > 20 * 20
+    }
+    on(d.scroller, "touchstart", function (e) {
+      if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e) && !clickInGutter(cm, e)) {
+        d.input.ensurePolled();
+        clearTimeout(touchFinished);
+        var now = +new Date;
+        d.activeTouch = {start: now, moved: false,
+                         prev: now - prevTouch.end <= 300 ? prevTouch : null};
+        if (e.touches.length == 1) {
+          d.activeTouch.left = e.touches[0].pageX;
+          d.activeTouch.top = e.touches[0].pageY;
+        }
+      }
+    });
+    on(d.scroller, "touchmove", function () {
+      if (d.activeTouch) { d.activeTouch.moved = true; }
+    });
+    on(d.scroller, "touchend", function (e) {
+      var touch = d.activeTouch;
+      if (touch && !eventInWidget(d, e) && touch.left != null &&
+          !touch.moved && new Date - touch.start < 300) {
+        var pos = cm.coordsChar(d.activeTouch, "page"), range;
+        if (!touch.prev || farAway(touch, touch.prev)) // Single tap
+          { range = new Range(pos, pos); }
+        else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
+          { range = cm.findWordAt(pos); }
+        else // Triple tap
+          { range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); }
+        cm.setSelection(range.anchor, range.head);
+        cm.focus();
+        e_preventDefault(e);
+      }
+      finishTouch();
+    });
+    on(d.scroller, "touchcancel", finishTouch);
+
+    // Sync scrolling between fake scrollbars and real scrollable
+    // area, ensure viewport is updated when scrolling.
+    on(d.scroller, "scroll", function () {
+      if (d.scroller.clientHeight) {
+        updateScrollTop(cm, d.scroller.scrollTop);
+        setScrollLeft(cm, d.scroller.scrollLeft, true);
+        signal(cm, "scroll", cm);
+      }
+    });
+
+    // Listen to wheel events in order to try and update the viewport on time.
+    on(d.scroller, "mousewheel", function (e) { return onScrollWheel(cm, e); });
+    on(d.scroller, "DOMMouseScroll", function (e) { return onScrollWheel(cm, e); });
+
+    // Prevent wrapper from ever scrolling
+    on(d.wrapper, "scroll", function () { return d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
+
+    d.dragFunctions = {
+      enter: function (e) {if (!signalDOMEvent(cm, e)) { e_stop(e); }},
+      over: function (e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
+      start: function (e) { return onDragStart(cm, e); },
+      drop: operation(cm, onDrop),
+      leave: function (e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
+    };
+
+    var inp = d.input.getField();
+    on(inp, "keyup", function (e) { return onKeyUp.call(cm, e); });
+    on(inp, "keydown", operation(cm, onKeyDown));
+    on(inp, "keypress", operation(cm, onKeyPress));
+    on(inp, "focus", function (e) { return onFocus(cm, e); });
+    on(inp, "blur", function (e) { return onBlur(cm, e); });
+  }
+
+  var initHooks = [];
+  CodeMirror.defineInitHook = function (f) { return initHooks.push(f); };
+
+  // Indent the given line. The how parameter can be "smart",
+  // "add"/null, "subtract", or "prev". When aggressive is false
+  // (typically set to true for forced single-line indents), empty
+  // lines are not indented, and places where the mode returns Pass
+  // are left alone.
+  function indentLine(cm, n, how, aggressive) {
+    var doc = cm.doc, state;
+    if (how == null) { how = "add"; }
+    if (how == "smart") {
+      // Fall back to "prev" when the mode doesn't have an indentation
+      // method.
+      if (!doc.mode.indent) { how = "prev"; }
+      else { state = getContextBefore(cm, n).state; }
+    }
+
+    var tabSize = cm.options.tabSize;
+    var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
+    if (line.stateAfter) { line.stateAfter = null; }
+    var curSpaceString = line.text.match(/^\s*/)[0], indentation;
+    if (!aggressive && !/\S/.test(line.text)) {
+      indentation = 0;
+      how = "not";
+    } else if (how == "smart") {
+      indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
+      if (indentation == Pass || indentation > 150) {
+        if (!aggressive) { return }
+        how = "prev";
+      }
+    }
+    if (how == "prev") {
+      if (n > doc.first) { indentation = countColumn(getLine(doc, n-1).text, null, tabSize); }
+      else { indentation = 0; }
+    } else if (how == "add") {
+      indentation = curSpace + cm.options.indentUnit;
+    } else if (how == "subtract") {
+      indentation = curSpace - cm.options.indentUnit;
+    } else if (typeof how == "number") {
+      indentation = curSpace + how;
+    }
+    indentation = Math.max(0, indentation);
+
+    var indentString = "", pos = 0;
+    if (cm.options.indentWithTabs)
+      { for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";} }
+    if (pos < indentation) { indentString += spaceStr(indentation - pos); }
+
+    if (indentString != curSpaceString) {
+      replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+      line.stateAfter = null;
+      return true
+    } else {
+      // Ensure that, if the cursor was in the whitespace at the start
+      // of the line, it is moved to the end of that space.
+      for (var i$1 = 0; i$1 < doc.sel.ranges.length; i$1++) {
+        var range = doc.sel.ranges[i$1];
+        if (range.head.line == n && range.head.ch < curSpaceString.length) {
+          var pos$1 = Pos(n, curSpaceString.length);
+          replaceOneSelection(doc, i$1, new Range(pos$1, pos$1));
+          break
+        }
+      }
+    }
+  }
+
+  // This will be set to a {lineWise: bool, text: [string]} object, so
+  // that, when pasting, we know what kind of selections the copied
+  // text was made out of.
+  var lastCopied = null;
+
+  function setLastCopied(newLastCopied) {
+    lastCopied = newLastCopied;
+  }
+
+  function applyTextInput(cm, inserted, deleted, sel, origin) {
+    var doc = cm.doc;
+    cm.display.shift = false;
+    if (!sel) { sel = doc.sel; }
+
+    var recent = +new Date - 200;
+    var paste = origin == "paste" || cm.state.pasteIncoming > recent;
+    var textLines = splitLinesAuto(inserted), multiPaste = null;
+    // When pasting N lines into N selections, insert one line per selection
+    if (paste && sel.ranges.length > 1) {
+      if (lastCopied && lastCopied.text.join("\n") == inserted) {
+        if (sel.ranges.length % lastCopied.text.length == 0) {
+          multiPaste = [];
+          for (var i = 0; i < lastCopied.text.length; i++)
+            { multiPaste.push(doc.splitLines(lastCopied.text[i])); }
+        }
+      } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) {
+        multiPaste = map(textLines, function (l) { return [l]; });
+      }
+    }
+
+    var updateInput = cm.curOp.updateInput;
+    // Normal behavior is to insert the new text into every selection
+    for (var i$1 = sel.ranges.length - 1; i$1 >= 0; i$1--) {
+      var range$$1 = sel.ranges[i$1];
+      var from = range$$1.from(), to = range$$1.to();
+      if (range$$1.empty()) {
+        if (deleted && deleted > 0) // Handle deletion
+          { from = Pos(from.line, from.ch - deleted); }
+        else if (cm.state.overwrite && !paste) // Handle overwrite
+          { to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); }
+        else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
+          { from = to = Pos(from.line, 0); }
+      }
+      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines,
+                         origin: origin || (paste ? "paste" : cm.state.cutIncoming > recent ? "cut" : "+input")};
+      makeChange(cm.doc, changeEvent);
+      signalLater(cm, "inputRead", cm, changeEvent);
+    }
+    if (inserted && !paste)
+      { triggerElectric(cm, inserted); }
+
+    ensureCursorVisible(cm);
+    if (cm.curOp.updateInput < 2) { cm.curOp.updateInput = updateInput; }
+    cm.curOp.typing = true;
+    cm.state.pasteIncoming = cm.state.cutIncoming = -1;
+  }
+
+  function handlePaste(e, cm) {
+    var pasted = e.clipboardData && e.clipboardData.getData("Text");
+    if (pasted) {
+      e.preventDefault();
+      if (!cm.isReadOnly() && !cm.options.disableInput)
+        { runInOp(cm, function () { return applyTextInput(cm, pasted, 0, null, "paste"); }); }
+      return true
+    }
+  }
+
+  function triggerElectric(cm, inserted) {
+    // When an 'electric' character is inserted, immediately trigger a reindent
+    if (!cm.options.electricChars || !cm.options.smartIndent) { return }
+    var sel = cm.doc.sel;
+
+    for (var i = sel.ranges.length - 1; i >= 0; i--) {
+      var range$$1 = sel.ranges[i];
+      if (range$$1.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range$$1.head.line)) { continue }
+      var mode = cm.getModeAt(range$$1.head);
+      var indented = false;
+      if (mode.electricChars) {
+        for (var j = 0; j < mode.electricChars.length; j++)
+          { if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
+            indented = indentLine(cm, range$$1.head.line, "smart");
+            break
+          } }
+      } else if (mode.electricInput) {
+        if (mode.electricInput.test(getLine(cm.doc, range$$1.head.line).text.slice(0, range$$1.head.ch)))
+          { indented = indentLine(cm, range$$1.head.line, "smart"); }
+      }
+      if (indented) { signalLater(cm, "electricInput", cm, range$$1.head.line); }
+    }
+  }
+
+  function copyableRanges(cm) {
+    var text = [], ranges = [];
+    for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+      var line = cm.doc.sel.ranges[i].head.line;
+      var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+      ranges.push(lineRange);
+      text.push(cm.getRange(lineRange.anchor, lineRange.head));
+    }
+    return {text: text, ranges: ranges}
+  }
+
+  function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) {
+    field.setAttribute("autocorrect", autocorrect ? "" : "off");
+    field.setAttribute("autocapitalize", autocapitalize ? "" : "off");
+    field.setAttribute("spellcheck", !!spellcheck);
+  }
+
+  function hiddenTextarea() {
+    var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");
+    var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+    // The textarea is kept positioned near the cursor to prevent the
+    // fact that it'll be scrolled into view on input from scrolling
+    // our fake cursor out of view. On webkit, when wrap=off, paste is
+    // very slow. So make the area wide instead.
+    if (webkit) { te.style.width = "1000px"; }
+    else { te.setAttribute("wrap", "off"); }
+    // If border: 0; -- iOS fails to open keyboard (issue #1287)
+    if (ios) { te.style.border = "1px solid black"; }
+    disableBrowserMagic(te);
+    return div
+  }
+
+  // The publicly visible API. Note that methodOp(f) means
+  // 'wrap f in an operation, performed on its `this` parameter'.
+
+  // This is not the complete set of editor methods. Most of the
+  // methods defined on the Doc type are also injected into
+  // CodeMirror.prototype, for backwards compatibility and
+  // convenience.
+
+  function addEditorMethods(CodeMirror) {
+    var optionHandlers = CodeMirror.optionHandlers;
+
+    var helpers = CodeMirror.helpers = {};
+
+    CodeMirror.prototype = {
+      constructor: CodeMirror,
+      focus: function(){window.focus(); this.display.input.focus();},
+
+      setOption: function(option, value) {
+        var options = this.options, old = options[option];
+        if (options[option] == value && option != "mode") { return }
+        options[option] = value;
+        if (optionHandlers.hasOwnProperty(option))
+          { operation(this, optionHandlers[option])(this, value, old); }
+        signal(this, "optionChange", this, option);
+      },
+
+      getOption: function(option) {return this.options[option]},
+      getDoc: function() {return this.doc},
+
+      addKeyMap: function(map$$1, bottom) {
+        this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map$$1));
+      },
+      removeKeyMap: function(map$$1) {
+        var maps = this.state.keyMaps;
+        for (var i = 0; i < maps.length; ++i)
+          { if (maps[i] == map$$1 || maps[i].name == map$$1) {
+            maps.splice(i, 1);
+            return true
+          } }
+      },
+
+      addOverlay: methodOp(function(spec, options) {
+        var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
+        if (mode.startState) { throw new Error("Overlays may not be stateful.") }
+        insertSorted(this.state.overlays,
+                     {mode: mode, modeSpec: spec, opaque: options && options.opaque,
+                      priority: (options && options.priority) || 0},
+                     function (overlay) { return overlay.priority; });
+        this.state.modeGen++;
+        regChange(this);
+      }),
+      removeOverlay: methodOp(function(spec) {
+        var this$1 = this;
+
+        var overlays = this.state.overlays;
+        for (var i = 0; i < overlays.length; ++i) {
+          var cur = overlays[i].modeSpec;
+          if (cur == spec || typeof spec == "string" && cur.name == spec) {
+            overlays.splice(i, 1);
+            this$1.state.modeGen++;
+            regChange(this$1);
+            return
+          }
+        }
+      }),
+
+      indentLine: methodOp(function(n, dir, aggressive) {
+        if (typeof dir != "string" && typeof dir != "number") {
+          if (dir == null) { dir = this.options.smartIndent ? "smart" : "prev"; }
+          else { dir = dir ? "add" : "subtract"; }
+        }
+        if (isLine(this.doc, n)) { indentLine(this, n, dir, aggressive); }
+      }),
+      indentSelection: methodOp(function(how) {
+        var this$1 = this;
+
+        var ranges = this.doc.sel.ranges, end = -1;
+        for (var i = 0; i < ranges.length; i++) {
+          var range$$1 = ranges[i];
+          if (!range$$1.empty()) {
+            var from = range$$1.from(), to = range$$1.to();
+            var start = Math.max(end, from.line);
+            end = Math.min(this$1.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
+            for (var j = start; j < end; ++j)
+              { indentLine(this$1, j, how); }
+            var newRanges = this$1.doc.sel.ranges;
+            if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
+              { replaceOneSelection(this$1.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); }
+          } else if (range$$1.head.line > end) {
+            indentLine(this$1, range$$1.head.line, how, true);
+            end = range$$1.head.line;
+            if (i == this$1.doc.sel.primIndex) { ensureCursorVisible(this$1); }
+          }
+        }
+      }),
+
+      // Fetch the parser token for a given character. Useful for hacks
+      // that want to inspect the mode state (say, for completion).
+      getTokenAt: function(pos, precise) {
+        return takeToken(this, pos, precise)
+      },
+
+      getLineTokens: function(line, precise) {
+        return takeToken(this, Pos(line), precise, true)
+      },
+
+      getTokenTypeAt: function(pos) {
+        pos = clipPos(this.doc, pos);
+        var styles = getLineStyles(this, getLine(this.doc, pos.line));
+        var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
+        var type;
+        if (ch == 0) { type = styles[2]; }
+        else { for (;;) {
+          var mid = (before + after) >> 1;
+          if ((mid ? styles[mid * 2 - 1] : 0) >= ch) { after = mid; }
+          else if (styles[mid * 2 + 1] < ch) { before = mid + 1; }
+          else { type = styles[mid * 2 + 2]; break }
+        } }
+        var cut = type ? type.indexOf("overlay ") : -1;
+        return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1)
+      },
+
+      getModeAt: function(pos) {
+        var mode = this.doc.mode;
+        if (!mode.innerMode) { return mode }
+        return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode
+      },
+
+      getHelper: function(pos, type) {
+        return this.getHelpers(pos, type)[0]
+      },
+
+      getHelpers: function(pos, type) {
+        var this$1 = this;
+
+        var found = [];
+        if (!helpers.hasOwnProperty(type)) { return found }
+        var help = helpers[type], mode = this.getModeAt(pos);
+        if (typeof mode[type] == "string") {
+          if (help[mode[type]]) { found.push(help[mode[type]]); }
+        } else if (mode[type]) {
+          for (var i = 0; i < mode[type].length; i++) {
+            var val = help[mode[type][i]];
+            if (val) { found.push(val); }
+          }
+        } else if (mode.helperType && help[mode.helperType]) {
+          found.push(help[mode.helperType]);
+        } else if (help[mode.name]) {
+          found.push(help[mode.name]);
+        }
+        for (var i$1 = 0; i$1 < help._global.length; i$1++) {
+          var cur = help._global[i$1];
+          if (cur.pred(mode, this$1) && indexOf(found, cur.val) == -1)
+            { found.push(cur.val); }
+        }
+        return found
+      },
+
+      getStateAfter: function(line, precise) {
+        var doc = this.doc;
+        line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
+        return getContextBefore(this, line + 1, precise).state
+      },
+
+      cursorCoords: function(start, mode) {
+        var pos, range$$1 = this.doc.sel.primary();
+        if (start == null) { pos = range$$1.head; }
+        else if (typeof start == "object") { pos = clipPos(this.doc, start); }
+        else { pos = start ? range$$1.from() : range$$1.to(); }
+        return cursorCoords(this, pos, mode || "page")
+      },
+
+      charCoords: function(pos, mode) {
+        return charCoords(this, clipPos(this.doc, pos), mode || "page")
+      },
+
+      coordsChar: function(coords, mode) {
+        coords = fromCoordSystem(this, coords, mode || "page");
+        return coordsChar(this, coords.left, coords.top)
+      },
+
+      lineAtHeight: function(height, mode) {
+        height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
+        return lineAtHeight(this.doc, height + this.display.viewOffset)
+      },
+      heightAtLine: function(line, mode, includeWidgets) {
+        var end = false, lineObj;
+        if (typeof line == "number") {
+          var last = this.doc.first + this.doc.size - 1;
+          if (line < this.doc.first) { line = this.doc.first; }
+          else if (line > last) { line = last; end = true; }
+          lineObj = getLine(this.doc, line);
+        } else {
+          lineObj = line;
+        }
+        return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets || end).top +
+          (end ? this.doc.height - heightAtLine(lineObj) : 0)
+      },
+
+      defaultTextHeight: function() { return textHeight(this.display) },
+      defaultCharWidth: function() { return charWidth(this.display) },
+
+      getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
+
+      addWidget: function(pos, node, scroll, vert, horiz) {
+        var display = this.display;
+        pos = cursorCoords(this, clipPos(this.doc, pos));
+        var top = pos.bottom, left = pos.left;
+        node.style.position = "absolute";
+        node.setAttribute("cm-ignore-events", "true");
+        this.display.input.setUneditable(node);
+        display.sizer.appendChild(node);
+        if (vert == "over") {
+          top = pos.top;
+        } else if (vert == "above" || vert == "near") {
+          var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
+          hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
+          // Default to positioning above (if specified and possible); otherwise default to positioning below
+          if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
+            { top = pos.top - node.offsetHeight; }
+          else if (pos.bottom + node.offsetHeight <= vspace)
+            { top = pos.bottom; }
+          if (left + node.offsetWidth > hspace)
+            { left = hspace - node.offsetWidth; }
+        }
+        node.style.top = top + "px";
+        node.style.left = node.style.right = "";
+        if (horiz == "right") {
+          left = display.sizer.clientWidth - node.offsetWidth;
+          node.style.right = "0px";
+        } else {
+          if (horiz == "left") { left = 0; }
+          else if (horiz == "middle") { left = (display.sizer.clientWidth - node.offsetWidth) / 2; }
+          node.style.left = left + "px";
+        }
+        if (scroll)
+          { scrollIntoView(this, {left: left, top: top, right: left + node.offsetWidth, bottom: top + node.offsetHeight}); }
+      },
+
+      triggerOnKeyDown: methodOp(onKeyDown),
+      triggerOnKeyPress: methodOp(onKeyPress),
+      triggerOnKeyUp: onKeyUp,
+      triggerOnMouseDown: methodOp(onMouseDown),
+
+      execCommand: function(cmd) {
+        if (commands.hasOwnProperty(cmd))
+          { return commands[cmd].call(null, this) }
+      },
+
+      triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
+
+      findPosH: function(from, amount, unit, visually) {
+        var this$1 = this;
+
+        var dir = 1;
+        if (amount < 0) { dir = -1; amount = -amount; }
+        var cur = clipPos(this.doc, from);
+        for (var i = 0; i < amount; ++i) {
+          cur = findPosH(this$1.doc, cur, dir, unit, visually);
+          if (cur.hitSide) { break }
+        }
+        return cur
+      },
+
+      moveH: methodOp(function(dir, unit) {
+        var this$1 = this;
+
+        this.extendSelectionsBy(function (range$$1) {
+          if (this$1.display.shift || this$1.doc.extend || range$$1.empty())
+            { return findPosH(this$1.doc, range$$1.head, dir, unit, this$1.options.rtlMoveVisually) }
+          else
+            { return dir < 0 ? range$$1.from() : range$$1.to() }
+        }, sel_move);
+      }),
+
+      deleteH: methodOp(function(dir, unit) {
+        var sel = this.doc.sel, doc = this.doc;
+        if (sel.somethingSelected())
+          { doc.replaceSelection("", null, "+delete"); }
+        else
+          { deleteNearSelection(this, function (range$$1) {
+            var other = findPosH(doc, range$$1.head, dir, unit, false);
+            return dir < 0 ? {from: other, to: range$$1.head} : {from: range$$1.head, to: other}
+          }); }
+      }),
+
+      findPosV: function(from, amount, unit, goalColumn) {
+        var this$1 = this;
+
+        var dir = 1, x = goalColumn;
+        if (amount < 0) { dir = -1; amount = -amount; }
+        var cur = clipPos(this.doc, from);
+        for (var i = 0; i < amount; ++i) {
+          var coords = cursorCoords(this$1, cur, "div");
+          if (x == null) { x = coords.left; }
+          else { coords.left = x; }
+          cur = findPosV(this$1, coords, dir, unit);
+          if (cur.hitSide) { break }
+        }
+        return cur
+      },
+
+      moveV: methodOp(function(dir, unit) {
+        var this$1 = this;
+
+        var doc = this.doc, goals = [];
+        var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected();
+        doc.extendSelectionsBy(function (range$$1) {
+          if (collapse)
+            { return dir < 0 ? range$$1.from() : range$$1.to() }
+          var headPos = cursorCoords(this$1, range$$1.head, "div");
+          if (range$$1.goalColumn != null) { headPos.left = range$$1.goalColumn; }
+          goals.push(headPos.left);
+          var pos = findPosV(this$1, headPos, dir, unit);
+          if (unit == "page" && range$$1 == doc.sel.primary())
+            { addToScrollTop(this$1, charCoords(this$1, pos, "div").top - headPos.top); }
+          return pos
+        }, sel_move);
+        if (goals.length) { for (var i = 0; i < doc.sel.ranges.length; i++)
+          { doc.sel.ranges[i].goalColumn = goals[i]; } }
+      }),
+
+      // Find the word at the given position (as returned by coordsChar).
+      findWordAt: function(pos) {
+        var doc = this.doc, line = getLine(doc, pos.line).text;
+        var start = pos.ch, end = pos.ch;
+        if (line) {
+          var helper = this.getHelper(pos, "wordChars");
+          if ((pos.sticky == "before" || end == line.length) && start) { --start; } else { ++end; }
+          var startChar = line.charAt(start);
+          var check = isWordChar(startChar, helper)
+            ? function (ch) { return isWordChar(ch, helper); }
+            : /\s/.test(startChar) ? function (ch) { return /\s/.test(ch); }
+            : function (ch) { return (!/\s/.test(ch) && !isWordChar(ch)); };
+          while (start > 0 && check(line.charAt(start - 1))) { --start; }
+          while (end < line.length && check(line.charAt(end))) { ++end; }
+        }
+        return new Range(Pos(pos.line, start), Pos(pos.line, end))
+      },
+
+      toggleOverwrite: function(value) {
+        if (value != null && value == this.state.overwrite) { return }
+        if (this.state.overwrite = !this.state.overwrite)
+          { addClass(this.display.cursorDiv, "CodeMirror-overwrite"); }
+        else
+          { rmClass(this.display.cursorDiv, "CodeMirror-overwrite"); }
+
+        signal(this, "overwriteToggle", this, this.state.overwrite);
+      },
+      hasFocus: function() { return this.display.input.getField() == activeElt() },
+      isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
+
+      scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y); }),
+      getScrollInfo: function() {
+        var scroller = this.display.scroller;
+        return {left: scroller.scrollLeft, top: scroller.scrollTop,
+                height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
+                width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
+                clientHeight: displayHeight(this), clientWidth: displayWidth(this)}
+      },
+
+      scrollIntoView: methodOp(function(range$$1, margin) {
+        if (range$$1 == null) {
+          range$$1 = {from: this.doc.sel.primary().head, to: null};
+          if (margin == null) { margin = this.options.cursorScrollMargin; }
+        } else if (typeof range$$1 == "number") {
+          range$$1 = {from: Pos(range$$1, 0), to: null};
+        } else if (range$$1.from == null) {
+          range$$1 = {from: range$$1, to: null};
+        }
+        if (!range$$1.to) { range$$1.to = range$$1.from; }
+        range$$1.margin = margin || 0;
+
+        if (range$$1.from.line != null) {
+          scrollToRange(this, range$$1);
+        } else {
+          scrollToCoordsRange(this, range$$1.from, range$$1.to, range$$1.margin);
+        }
+      }),
+
+      setSize: methodOp(function(width, height) {
+        var this$1 = this;
+
+        var interpret = function (val) { return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; };
+        if (width != null) { this.display.wrapper.style.width = interpret(width); }
+        if (height != null) { this.display.wrapper.style.height = interpret(height); }
+        if (this.options.lineWrapping) { clearLineMeasurementCache(this); }
+        var lineNo$$1 = this.display.viewFrom;
+        this.doc.iter(lineNo$$1, this.display.viewTo, function (line) {
+          if (line.widgets) { for (var i = 0; i < line.widgets.length; i++)
+            { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo$$1, "widget"); break } } }
+          ++lineNo$$1;
+        });
+        this.curOp.forceUpdate = true;
+        signal(this, "refresh", this);
+      }),
+
+      operation: function(f){return runInOp(this, f)},
+      startOperation: function(){return startOperation(this)},
+      endOperation: function(){return endOperation(this)},
+
+      refresh: methodOp(function() {
+        var oldHeight = this.display.cachedTextHeight;
+        regChange(this);
+        this.curOp.forceUpdate = true;
+        clearCaches(this);
+        scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop);
+        updateGutterSpace(this.display);
+        if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+          { estimateLineHeights(this); }
+        signal(this, "refresh", this);
+      }),
+
+      swapDoc: methodOp(function(doc) {
+        var old = this.doc;
+        old.cm = null;
+        // Cancel the current text selection if any (#5821)
+        if (this.state.selectingText) { this.state.selectingText(); }
+        attachDoc(this, doc);
+        clearCaches(this);
+        this.display.input.reset();
+        scrollToCoords(this, doc.scrollLeft, doc.scrollTop);
+        this.curOp.forceScroll = true;
+        signalLater(this, "swapDoc", this, old);
+        return old
+      }),
+
+      phrase: function(phraseText) {
+        var phrases = this.options.phrases;
+        return phrases && Object.prototype.hasOwnProperty.call(phrases, phraseText) ? phrases[phraseText] : phraseText
+      },
+
+      getInputField: function(){return this.display.input.getField()},
+      getWrapperElement: function(){return this.display.wrapper},
+      getScrollerElement: function(){return this.display.scroller},
+      getGutterElement: function(){return this.display.gutters}
+    };
+    eventMixin(CodeMirror);
+
+    CodeMirror.registerHelper = function(type, name, value) {
+      if (!helpers.hasOwnProperty(type)) { helpers[type] = CodeMirror[type] = {_global: []}; }
+      helpers[type][name] = value;
+    };
+    CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
+      CodeMirror.registerHelper(type, name, value);
+      helpers[type]._global.push({pred: predicate, val: value});
+    };
+  }
+
+  // Used for horizontal relative motion. Dir is -1 or 1 (left or
+  // right), unit can be "char", "column" (like char, but doesn't
+  // cross line boundaries), "word" (across next word), or "group" (to
+  // the start of next group of word or non-word-non-whitespace
+  // chars). The visually param controls whether, in right-to-left
+  // text, direction 1 means to move towards the next index in the
+  // string, or towards the character to the right of the current
+  // position. The resulting position will have a hitSide=true
+  // property if it reached the end of the document.
+  function findPosH(doc, pos, dir, unit, visually) {
+    var oldPos = pos;
+    var origDir = dir;
+    var lineObj = getLine(doc, pos.line);
+    function findNextLine() {
+      var l = pos.line + dir;
+      if (l < doc.first || l >= doc.first + doc.size) { return false }
+      pos = new Pos(l, pos.ch, pos.sticky);
+      return lineObj = getLine(doc, l)
+    }
+    function moveOnce(boundToLine) {
+      var next;
+      if (visually) {
+        next = moveVisually(doc.cm, lineObj, pos, dir);
+      } else {
+        next = moveLogically(lineObj, pos, dir);
+      }
+      if (next == null) {
+        if (!boundToLine && findNextLine())
+          { pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir); }
+        else
+          { return false }
+      } else {
+        pos = next;
+      }
+      return true
+    }
+
+    if (unit == "char") {
+      moveOnce();
+    } else if (unit == "column") {
+      moveOnce(true);
+    } else if (unit == "word" || unit == "group") {
+      var sawType = null, group = unit == "group";
+      var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
+      for (var first = true;; first = false) {
+        if (dir < 0 && !moveOnce(!first)) { break }
+        var cur = lineObj.text.charAt(pos.ch) || "\n";
+        var type = isWordChar(cur, helper) ? "w"
+          : group && cur == "\n" ? "n"
+          : !group || /\s/.test(cur) ? null
+          : "p";
+        if (group && !first && !type) { type = "s"; }
+        if (sawType && sawType != type) {
+          if (dir < 0) {dir = 1; moveOnce(); pos.sticky = "after";}
+          break
+        }
+
+        if (type) { sawType = type; }
+        if (dir > 0 && !moveOnce(!first)) { break }
+      }
+    }
+    var result = skipAtomic(doc, pos, oldPos, origDir, true);
+    if (equalCursorPos(oldPos, result)) { result.hitSide = true; }
+    return result
+  }
+
+  // For relative vertical movement. Dir may be -1 or 1. Unit can be
+  // "page" or "line". The resulting position will have a hitSide=true
+  // property if it reached the end of the document.
+  function findPosV(cm, pos, dir, unit) {
+    var doc = cm.doc, x = pos.left, y;
+    if (unit == "page") {
+      var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
+      var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);
+      y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;
+
+    } else if (unit == "line") {
+      y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
+    }
+    var target;
+    for (;;) {
+      target = coordsChar(cm, x, y);
+      if (!target.outside) { break }
+      if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break }
+      y += dir * 5;
+    }
+    return target
+  }
+
+  // CONTENTEDITABLE INPUT STYLE
+
+  var ContentEditableInput = function(cm) {
+    this.cm = cm;
+    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
+    this.polling = new Delayed();
+    this.composing = null;
+    this.gracePeriod = false;
+    this.readDOMTimeout = null;
+  };
+
+  ContentEditableInput.prototype.init = function (display) {
+      var this$1 = this;
+
+    var input = this, cm = input.cm;
+    var div = input.div = display.lineDiv;
+    disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize);
+
+    on(div, "paste", function (e) {
+      if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
+      // IE doesn't fire input events, so we schedule a read for the pasted content in this way
+      if (ie_version <= 11) { setTimeout(operation(cm, function () { return this$1.updateFromDOM(); }), 20); }
+    });
+
+    on(div, "compositionstart", function (e) {
+      this$1.composing = {data: e.data, done: false};
+    });
+    on(div, "compositionupdate", function (e) {
+      if (!this$1.composing) { this$1.composing = {data: e.data, done: false}; }
+    });
+    on(div, "compositionend", function (e) {
+      if (this$1.composing) {
+        if (e.data != this$1.composing.data) { this$1.readFromDOMSoon(); }
+        this$1.composing.done = true;
+      }
+    });
+
+    on(div, "touchstart", function () { return input.forceCompositionEnd(); });
+
+    on(div, "input", function () {
+      if (!this$1.composing) { this$1.readFromDOMSoon(); }
+    });
+
+    function onCopyCut(e) {
+      if (signalDOMEvent(cm, e)) { return }
+      if (cm.somethingSelected()) {
+        setLastCopied({lineWise: false, text: cm.getSelections()});
+        if (e.type == "cut") { cm.replaceSelection("", null, "cut"); }
+      } else if (!cm.options.lineWiseCopyCut) {
+        return
+      } else {
+        var ranges = copyableRanges(cm);
+        setLastCopied({lineWise: true, text: ranges.text});
+        if (e.type == "cut") {
+          cm.operation(function () {
+            cm.setSelections(ranges.ranges, 0, sel_dontScroll);
+            cm.replaceSelection("", null, "cut");
+          });
+        }
+      }
+      if (e.clipboardData) {
+        e.clipboardData.clearData();
+        var content = lastCopied.text.join("\n");
+        // iOS exposes the clipboard API, but seems to discard content inserted into it
+        e.clipboardData.setData("Text", content);
+        if (e.clipboardData.getData("Text") == content) {
+          e.preventDefault();
+          return
+        }
+      }
+      // Old-fashioned briefly-focus-a-textarea hack
+      var kludge = hiddenTextarea(), te = kludge.firstChild;
+      cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
+      te.value = lastCopied.text.join("\n");
+      var hadFocus = document.activeElement;
+      selectInput(te);
+      setTimeout(function () {
+        cm.display.lineSpace.removeChild(kludge);
+        hadFocus.focus();
+        if (hadFocus == div) { input.showPrimarySelection(); }
+      }, 50);
+    }
+    on(div, "copy", onCopyCut);
+    on(div, "cut", onCopyCut);
+  };
+
+  ContentEditableInput.prototype.prepareSelection = function () {
+    var result = prepareSelection(this.cm, false);
+    result.focus = this.cm.state.focused;
+    return result
+  };
+
+  ContentEditableInput.prototype.showSelection = function (info, takeFocus) {
+    if (!info || !this.cm.display.view.length) { return }
+    if (info.focus || takeFocus) { this.showPrimarySelection(); }
+    this.showMultipleSelections(info);
+  };
+
+  ContentEditableInput.prototype.getSelection = function () {
+    return this.cm.display.wrapper.ownerDocument.getSelection()
+  };
+
+  ContentEditableInput.prototype.showPrimarySelection = function () {
+    var sel = this.getSelection(), cm = this.cm, prim = cm.doc.sel.primary();
+    var from = prim.from(), to = prim.to();
+
+    if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) {
+      sel.removeAllRanges();
+      return
+    }
+
+    var curAnchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+    var curFocus = domToPos(cm, sel.focusNode, sel.focusOffset);
+    if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
+        cmp(minPos(curAnchor, curFocus), from) == 0 &&
+        cmp(maxPos(curAnchor, curFocus), to) == 0)
+      { return }
+
+    var view = cm.display.view;
+    var start = (from.line >= cm.display.viewFrom && posToDOM(cm, from)) ||
+        {node: view[0].measure.map[2], offset: 0};
+    var end = to.line < cm.display.viewTo && posToDOM(cm, to);
+    if (!end) {
+      var measure = view[view.length - 1].measure;
+      var map$$1 = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
+      end = {node: map$$1[map$$1.length - 1], offset: map$$1[map$$1.length - 2] - map$$1[map$$1.length - 3]};
+    }
+
+    if (!start || !end) {
+      sel.removeAllRanges();
+      return
+    }
+
+    var old = sel.rangeCount && sel.getRangeAt(0), rng;
+    try { rng = range(start.node, start.offset, end.offset, end.node); }
+    catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
+    if (rng) {
+      if (!gecko && cm.state.focused) {
+        sel.collapse(start.node, start.offset);
+        if (!rng.collapsed) {
+          sel.removeAllRanges();
+          sel.addRange(rng);
+        }
+      } else {
+        sel.removeAllRanges();
+        sel.addRange(rng);
+      }
+      if (old && sel.anchorNode == null) { sel.addRange(old); }
+      else if (gecko) { this.startGracePeriod(); }
+    }
+    this.rememberSelection();
+  };
+
+  ContentEditableInput.prototype.startGracePeriod = function () {
+      var this$1 = this;
+
+    clearTimeout(this.gracePeriod);
+    this.gracePeriod = setTimeout(function () {
+      this$1.gracePeriod = false;
+      if (this$1.selectionChanged())
+        { this$1.cm.operation(function () { return this$1.cm.curOp.selectionChanged = true; }); }
+    }, 20);
+  };
+
+  ContentEditableInput.prototype.showMultipleSelections = function (info) {
+    removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
+    removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
+  };
+
+  ContentEditableInput.prototype.rememberSelection = function () {
+    var sel = this.getSelection();
+    this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
+    this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
+  };
+
+  ContentEditableInput.prototype.selectionInEditor = function () {
+    var sel = this.getSelection();
+    if (!sel.rangeCount) { return false }
+    var node = sel.getRangeAt(0).commonAncestorContainer;
+    return contains(this.div, node)
+  };
+
+  ContentEditableInput.prototype.focus = function () {
+    if (this.cm.options.readOnly != "nocursor") {
+      if (!this.selectionInEditor())
+        { this.showSelection(this.prepareSelection(), true); }
+      this.div.focus();
+    }
+  };
+  ContentEditableInput.prototype.blur = function () { this.div.blur(); };
+  ContentEditableInput.prototype.getField = function () { return this.div };
+
+  ContentEditableInput.prototype.supportsTouch = function () { return true };
+
+  ContentEditableInput.prototype.receivedFocus = function () {
+    var input = this;
+    if (this.selectionInEditor())
+      { this.pollSelection(); }
+    else
+      { runInOp(this.cm, function () { return input.cm.curOp.selectionChanged = true; }); }
+
+    function poll() {
+      if (input.cm.state.focused) {
+        input.pollSelection();
+        input.polling.set(input.cm.options.pollInterval, poll);
+      }
+    }
+    this.polling.set(this.cm.options.pollInterval, poll);
+  };
+
+  ContentEditableInput.prototype.selectionChanged = function () {
+    var sel = this.getSelection();
+    return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
+      sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
+  };
+
+  ContentEditableInput.prototype.pollSelection = function () {
+    if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) { return }
+    var sel = this.getSelection(), cm = this.cm;
+    // On Android Chrome (version 56, at least), backspacing into an
+    // uneditable block element will put the cursor in that element,
+    // and then, because it's not editable, hide the virtual keyboard.
+    // Because Android doesn't allow us to actually detect backspace
+    // presses in a sane way, this code checks for when that happens
+    // and simulates a backspace press in this case.
+    if (android && chrome && this.cm.display.gutterSpecs.length && isInGutter(sel.anchorNode)) {
+      this.cm.triggerOnKeyDown({type: "keydown", keyCode: 8, preventDefault: Math.abs});
+      this.blur();
+      this.focus();
+      return
+    }
+    if (this.composing) { return }
+    this.rememberSelection();
+    var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+    var head = domToPos(cm, sel.focusNode, sel.focusOffset);
+    if (anchor && head) { runInOp(cm, function () {
+      setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+      if (anchor.bad || head.bad) { cm.curOp.selectionChanged = true; }
+    }); }
+  };
+
+  ContentEditableInput.prototype.pollContent = function () {
+    if (this.readDOMTimeout != null) {
+      clearTimeout(this.readDOMTimeout);
+      this.readDOMTimeout = null;
+    }
+
+    var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
+    var from = sel.from(), to = sel.to();
+    if (from.ch == 0 && from.line > cm.firstLine())
+      { from = Pos(from.line - 1, getLine(cm.doc, from.line - 1).length); }
+    if (to.ch == getLine(cm.doc, to.line).text.length && to.line < cm.lastLine())
+      { to = Pos(to.line + 1, 0); }
+    if (from.line < display.viewFrom || to.line > display.viewTo - 1) { return false }
+
+    var fromIndex, fromLine, fromNode;
+    if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
+      fromLine = lineNo(display.view[0].line);
+      fromNode = display.view[0].node;
+    } else {
+      fromLine = lineNo(display.view[fromIndex].line);
+      fromNode = display.view[fromIndex - 1].node.nextSibling;
+    }
+    var toIndex = findViewIndex(cm, to.line);
+    var toLine, toNode;
+    if (toIndex == display.view.length - 1) {
+      toLine = display.viewTo - 1;
+      toNode = display.lineDiv.lastChild;
+    } else {
+      toLine = lineNo(display.view[toIndex + 1].line) - 1;
+      toNode = display.view[toIndex + 1].node.previousSibling;
+    }
+
+    if (!fromNode) { return false }
+    var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
+    var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
+    while (newText.length > 1 && oldText.length > 1) {
+      if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
+      else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
+      else { break }
+    }
+
+    var cutFront = 0, cutEnd = 0;
+    var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+    while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
+      { ++cutFront; }
+    var newBot = lst(newText), oldBot = lst(oldText);
+    var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
+                             oldBot.length - (oldText.length == 1 ? cutFront : 0));
+    while (cutEnd < maxCutEnd &&
+           newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
+      { ++cutEnd; }
+    // Try to move start of change to start of selection if ambiguous
+    if (newText.length == 1 && oldText.length == 1 && fromLine == from.line) {
+      while (cutFront && cutFront > from.ch &&
+             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) {
+        cutFront--;
+        cutEnd++;
+      }
+    }
+
+    newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, "");
+    newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, "");
+
+    var chFrom = Pos(fromLine, cutFront);
+    var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
+    if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
+      replaceRange(cm.doc, newText, chFrom, chTo, "+input");
+      return true
+    }
+  };
+
+  ContentEditableInput.prototype.ensurePolled = function () {
+    this.forceCompositionEnd();
+  };
+  ContentEditableInput.prototype.reset = function () {
+    this.forceCompositionEnd();
+  };
+  ContentEditableInput.prototype.forceCompositionEnd = function () {
+    if (!this.composing) { return }
+    clearTimeout(this.readDOMTimeout);
+    this.composing = null;
+    this.updateFromDOM();
+    this.div.blur();
+    this.div.focus();
+  };
+  ContentEditableInput.prototype.readFromDOMSoon = function () {
+      var this$1 = this;
+
+    if (this.readDOMTimeout != null) { return }
+    this.readDOMTimeout = setTimeout(function () {
+      this$1.readDOMTimeout = null;
+      if (this$1.composing) {
+        if (this$1.composing.done) { this$1.composing = null; }
+        else { return }
+      }
+      this$1.updateFromDOM();
+    }, 80);
+  };
+
+  ContentEditableInput.prototype.updateFromDOM = function () {
+      var this$1 = this;
+
+    if (this.cm.isReadOnly() || !this.pollContent())
+      { runInOp(this.cm, function () { return regChange(this$1.cm); }); }
+  };
+
+  ContentEditableInput.prototype.setUneditable = function (node) {
+    node.contentEditable = "false";
+  };
+
+  ContentEditableInput.prototype.onKeyPress = function (e) {
+    if (e.charCode == 0 || this.composing) { return }
+    e.preventDefault();
+    if (!this.cm.isReadOnly())
+      { operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); }
+  };
+
+  ContentEditableInput.prototype.readOnlyChanged = function (val) {
+    this.div.contentEditable = String(val != "nocursor");
+  };
+
+  ContentEditableInput.prototype.onContextMenu = function () {};
+  ContentEditableInput.prototype.resetPosition = function () {};
+
+  ContentEditableInput.prototype.needsContentAttribute = true;
+
+  function posToDOM(cm, pos) {
+    var view = findViewForLine(cm, pos.line);
+    if (!view || view.hidden) { return null }
+    var line = getLine(cm.doc, pos.line);
+    var info = mapFromLineView(view, line, pos.line);
+
+    var order = getOrder(line, cm.doc.direction), side = "left";
+    if (order) {
+      var partPos = getBidiPartAt(order, pos.ch);
+      side = partPos % 2 ? "right" : "left";
+    }
+    var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
+    result.offset = result.collapse == "right" ? result.end : result.start;
+    return result
+  }
+
+  function isInGutter(node) {
+    for (var scan = node; scan; scan = scan.parentNode)
+      { if (/CodeMirror-gutter-wrapper/.test(scan.className)) { return true } }
+    return false
+  }
+
+  function badPos(pos, bad) { if (bad) { pos.bad = true; } return pos }
+
+  function domTextBetween(cm, from, to, fromLine, toLine) {
+    var text = "", closing = false, lineSep = cm.doc.lineSeparator(), extraLinebreak = false;
+    function recognizeMarker(id) { return function (marker) { return marker.id == id; } }
+    function close() {
+      if (closing) {
+        text += lineSep;
+        if (extraLinebreak) { text += lineSep; }
+        closing = extraLinebreak = false;
+      }
+    }
+    function addText(str) {
+      if (str) {
+        close();
+        text += str;
+      }
+    }
+    function walk(node) {
+      if (node.nodeType == 1) {
+        var cmText = node.getAttribute("cm-text");
+        if (cmText) {
+          addText(cmText);
+          return
+        }
+        var markerID = node.getAttribute("cm-marker"), range$$1;
+        if (markerID) {
+          var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
+          if (found.length && (range$$1 = found[0].find(0)))
+            { addText(getBetween(cm.doc, range$$1.from, range$$1.to).join(lineSep)); }
+          return
+        }
+        if (node.getAttribute("contenteditable") == "false") { return }
+        var isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName);
+        if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) { return }
+
+        if (isBlock) { close(); }
+        for (var i = 0; i < node.childNodes.length; i++)
+          { walk(node.childNodes[i]); }
+
+        if (/^(pre|p)$/i.test(node.nodeName)) { extraLinebreak = true; }
+        if (isBlock) { closing = true; }
+      } else if (node.nodeType == 3) {
+        addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " "));
+      }
+    }
+    for (;;) {
+      walk(from);
+      if (from == to) { break }
+      from = from.nextSibling;
+      extraLinebreak = false;
+    }
+    return text
+  }
+
+  function domToPos(cm, node, offset) {
+    var lineNode;
+    if (node == cm.display.lineDiv) {
+      lineNode = cm.display.lineDiv.childNodes[offset];
+      if (!lineNode) { return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true) }
+      node = null; offset = 0;
+    } else {
+      for (lineNode = node;; lineNode = lineNode.parentNode) {
+        if (!lineNode || lineNode == cm.display.lineDiv) { return null }
+        if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) { break }
+      }
+    }
+    for (var i = 0; i < cm.display.view.length; i++) {
+      var lineView = cm.display.view[i];
+      if (lineView.node == lineNode)
+        { return locateNodeInLineView(lineView, node, offset) }
+    }
+  }
+
+  function locateNodeInLineView(lineView, node, offset) {
+    var wrapper = lineView.text.firstChild, bad = false;
+    if (!node || !contains(wrapper, node)) { return badPos(Pos(lineNo(lineView.line), 0), true) }
+    if (node == wrapper) {
+      bad = true;
+      node = wrapper.childNodes[offset];
+      offset = 0;
+      if (!node) {
+        var line = lineView.rest ? lst(lineView.rest) : lineView.line;
+        return badPos(Pos(lineNo(line), line.text.length), bad)
+      }
+    }
+
+    var textNode = node.nodeType == 3 ? node : null, topNode = node;
+    if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
+      textNode = node.firstChild;
+      if (offset) { offset = textNode.nodeValue.length; }
+    }
+    while (topNode.parentNode != wrapper) { topNode = topNode.parentNode; }
+    var measure = lineView.measure, maps = measure.maps;
+
+    function find(textNode, topNode, offset) {
+      for (var i = -1; i < (maps ? maps.length : 0); i++) {
+        var map$$1 = i < 0 ? measure.map : maps[i];
+        for (var j = 0; j < map$$1.length; j += 3) {
+          var curNode = map$$1[j + 2];
+          if (curNode == textNode || curNode == topNode) {
+            var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
+            var ch = map$$1[j] + offset;
+            if (offset < 0 || curNode != textNode) { ch = map$$1[j + (offset ? 1 : 0)]; }
+            return Pos(line, ch)
+          }
+        }
+      }
+    }
+    var found = find(textNode, topNode, offset);
+    if (found) { return badPos(found, bad) }
+
+    // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
+    for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
+      found = find(after, after.firstChild, 0);
+      if (found)
+        { return badPos(Pos(found.line, found.ch - dist), bad) }
+      else
+        { dist += after.textContent.length; }
+    }
+    for (var before = topNode.previousSibling, dist$1 = offset; before; before = before.previousSibling) {
+      found = find(before, before.firstChild, -1);
+      if (found)
+        { return badPos(Pos(found.line, found.ch + dist$1), bad) }
+      else
+        { dist$1 += before.textContent.length; }
+    }
+  }
+
+  // TEXTAREA INPUT STYLE
+
+  var TextareaInput = function(cm) {
+    this.cm = cm;
+    // See input.poll and input.reset
+    this.prevInput = "";
+
+    // Flag that indicates whether we expect input to appear real soon
+    // now (after some event like 'keypress' or 'input') and are
+    // polling intensively.
+    this.pollingFast = false;
+    // Self-resetting timeout for the poller
+    this.polling = new Delayed();
+    // Used to work around IE issue with selection being forgotten when focus moves away from textarea
+    this.hasSelection = false;
+    this.composing = null;
+  };
+
+  TextareaInput.prototype.init = function (display) {
+      var this$1 = this;
+
+    var input = this, cm = this.cm;
+    this.createField(display);
+    var te = this.textarea;
+
+    display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild);
+
+    // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
+    if (ios) { te.style.width = "0px"; }
+
+    on(te, "input", function () {
+      if (ie && ie_version >= 9 && this$1.hasSelection) { this$1.hasSelection = null; }
+      input.poll();
+    });
+
+    on(te, "paste", function (e) {
+      if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
+
+      cm.state.pasteIncoming = +new Date;
+      input.fastPoll();
+    });
+
+    function prepareCopyCut(e) {
+      if (signalDOMEvent(cm, e)) { return }
+      if (cm.somethingSelected()) {
+        setLastCopied({lineWise: false, text: cm.getSelections()});
+      } else if (!cm.options.lineWiseCopyCut) {
+        return
+      } else {
+        var ranges = copyableRanges(cm);
+        setLastCopied({lineWise: true, text: ranges.text});
+        if (e.type == "cut") {
+          cm.setSelections(ranges.ranges, null, sel_dontScroll);
+        } else {
+          input.prevInput = "";
+          te.value = ranges.text.join("\n");
+          selectInput(te);
+        }
+      }
+      if (e.type == "cut") { cm.state.cutIncoming = +new Date; }
+    }
+    on(te, "cut", prepareCopyCut);
+    on(te, "copy", prepareCopyCut);
+
+    on(display.scroller, "paste", function (e) {
+      if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { return }
+      if (!te.dispatchEvent) {
+        cm.state.pasteIncoming = +new Date;
+        input.focus();
+        return
+      }
+
+      // Pass the `paste` event to the textarea so it's handled by its event listener.
+      var event = new Event("paste");
+      event.clipboardData = e.clipboardData;
+      te.dispatchEvent(event);
+    });
+
+    // Prevent normal selection in the editor (we handle our own)
+    on(display.lineSpace, "selectstart", function (e) {
+      if (!eventInWidget(display, e)) { e_preventDefault(e); }
+    });
+
+    on(te, "compositionstart", function () {
+      var start = cm.getCursor("from");
+      if (input.composing) { input.composing.range.clear(); }
+      input.composing = {
+        start: start,
+        range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
+      };
+    });
+    on(te, "compositionend", function () {
+      if (input.composing) {
+        input.poll();
+        input.composing.range.clear();
+        input.composing = null;
+      }
+    });
+  };
+
+  TextareaInput.prototype.createField = function (_display) {
+    // Wraps and hides input textarea
+    this.wrapper = hiddenTextarea();
+    // The semihidden textarea that is focused when the editor is
+    // focused, and receives input.
+    this.textarea = this.wrapper.firstChild;
+  };
+
+  TextareaInput.prototype.prepareSelection = function () {
+    // Redraw the selection and/or cursor
+    var cm = this.cm, display = cm.display, doc = cm.doc;
+    var result = prepareSelection(cm);
+
+    // Move the hidden textarea near the cursor to prevent scrolling artifacts
+    if (cm.options.moveInputWithCursor) {
+      var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
+      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
+      result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+                                          headPos.top + lineOff.top - wrapOff.top));
+      result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+                                           headPos.left + lineOff.left - wrapOff.left));
+    }
+
+    return result
+  };
+
+  TextareaInput.prototype.showSelection = function (drawn) {
+    var cm = this.cm, display = cm.display;
+    removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
+    removeChildrenAndAdd(display.selectionDiv, drawn.selection);
+    if (drawn.teTop != null) {
+      this.wrapper.style.top = drawn.teTop + "px";
+      this.wrapper.style.left = drawn.teLeft + "px";
+    }
+  };
+
+  // Reset the input to correspond to the selection (or to be empty,
+  // when not typing and nothing is selected)
+  TextareaInput.prototype.reset = function (typing) {
+    if (this.contextMenuPending || this.composing) { return }
+    var cm = this.cm;
+    if (cm.somethingSelected()) {
+      this.prevInput = "";
+      var content = cm.getSelection();
+      this.textarea.value = content;
+      if (cm.state.focused) { selectInput(this.textarea); }
+      if (ie && ie_version >= 9) { this.hasSelection = content; }
+    } else if (!typing) {
+      this.prevInput = this.textarea.value = "";
+      if (ie && ie_version >= 9) { this.hasSelection = null; }
+    }
+  };
+
+  TextareaInput.prototype.getField = function () { return this.textarea };
+
+  TextareaInput.prototype.supportsTouch = function () { return false };
+
+  TextareaInput.prototype.focus = function () {
+    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
+      try { this.textarea.focus(); }
+      catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
+    }
+  };
+
+  TextareaInput.prototype.blur = function () { this.textarea.blur(); };
+
+  TextareaInput.prototype.resetPosition = function () {
+    this.wrapper.style.top = this.wrapper.style.left = 0;
+  };
+
+  TextareaInput.prototype.receivedFocus = function () { this.slowPoll(); };
+
+  // Poll for input changes, using the normal rate of polling. This
+  // runs as long as the editor is focused.
+  TextareaInput.prototype.slowPoll = function () {
+      var this$1 = this;
+
+    if (this.pollingFast) { return }
+    this.polling.set(this.cm.options.pollInterval, function () {
+      this$1.poll();
+      if (this$1.cm.state.focused) { this$1.slowPoll(); }
+    });
+  };
+
+  // When an event has just come in that is likely to add or change
+  // something in the input textarea, we poll faster, to ensure that
+  // the change appears on the screen quickly.
+  TextareaInput.prototype.fastPoll = function () {
+    var missed = false, input = this;
+    input.pollingFast = true;
+    function p() {
+      var changed = input.poll();
+      if (!changed && !missed) {missed = true; input.polling.set(60, p);}
+      else {input.pollingFast = false; input.slowPoll();}
+    }
+    input.polling.set(20, p);
+  };
+
+  // Read input from the textarea, and update the document to match.
+  // When something is selected, it is present in the textarea, and
+  // selected (unless it is huge, in which case a placeholder is
+  // used). When nothing is selected, the cursor sits after previously
+  // seen text (can be empty), which is stored in prevInput (we must
+  // not reset the textarea when typing, because that breaks IME).
+  TextareaInput.prototype.poll = function () {
+      var this$1 = this;
+
+    var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
+    // Since this is called a *lot*, try to bail out as cheaply as
+    // possible when it is clear that nothing happened. hasSelection
+    // will be the case when there is a lot of text in the textarea,
+    // in which case reading its value would be expensive.
+    if (this.contextMenuPending || !cm.state.focused ||
+        (hasSelection(input) && !prevInput && !this.composing) ||
+        cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
+      { return false }
+
+    var text = input.value;
+    // If nothing changed, bail.
+    if (text == prevInput && !cm.somethingSelected()) { return false }
+    // Work around nonsensical selection resetting in IE9/10, and
+    // inexplicable appearance of private area unicode characters on
+    // some key combos in Mac (#2689).
+    if (ie && ie_version >= 9 && this.hasSelection === text ||
+        mac && /[\uf700-\uf7ff]/.test(text)) {
+      cm.display.input.reset();
+      return false
+    }
+
+    if (cm.doc.sel == cm.display.selForContextMenu) {
+      var first = text.charCodeAt(0);
+      if (first == 0x200b && !prevInput) { prevInput = "\u200b"; }
+      if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo") }
+    }
+    // Find the part of the input that is actually new
+    var same = 0, l = Math.min(prevInput.length, text.length);
+    while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) { ++same; }
+
+    runInOp(cm, function () {
+      applyTextInput(cm, text.slice(same), prevInput.length - same,
+                     null, this$1.composing ? "*compose" : null);
+
+      // Don't leave long text in the textarea, since it makes further polling slow
+      if (text.length > 1000 || text.indexOf("\n") > -1) { input.value = this$1.prevInput = ""; }
+      else { this$1.prevInput = text; }
+
+      if (this$1.composing) {
+        this$1.composing.range.clear();
+        this$1.composing.range = cm.markText(this$1.composing.start, cm.getCursor("to"),
+                                           {className: "CodeMirror-composing"});
+      }
+    });
+    return true
+  };
+
+  TextareaInput.prototype.ensurePolled = function () {
+    if (this.pollingFast && this.poll()) { this.pollingFast = false; }
+  };
+
+  TextareaInput.prototype.onKeyPress = function () {
+    if (ie && ie_version >= 9) { this.hasSelection = null; }
+    this.fastPoll();
+  };
+
+  TextareaInput.prototype.onContextMenu = function (e) {
+    var input = this, cm = input.cm, display = cm.display, te = input.textarea;
+    if (input.contextMenuPending) { input.contextMenuPending(); }
+    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
+    if (!pos || presto) { return } // Opera is difficult.
+
+    // Reset the current text selection only if the click is done outside of the selection
+    // and 'resetSelectionOnContextMenu' option is true.
+    var reset = cm.options.resetSelectionOnContextMenu;
+    if (reset && cm.doc.sel.contains(pos) == -1)
+      { operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); }
+
+    var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
+    var wrapperBox = input.wrapper.offsetParent.getBoundingClientRect();
+    input.wrapper.style.cssText = "position: static";
+    te.style.cssText = "position: absolute; width: 30px; height: 30px;\n      top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n      z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+    var oldScrollY;
+    if (webkit) { oldScrollY = window.scrollY; } // Work around Chrome issue (#2712)
+    display.input.focus();
+    if (webkit) { window.scrollTo(null, oldScrollY); }
+    display.input.reset();
+    // Adds "Select all" to context menu in FF
+    if (!cm.somethingSelected()) { te.value = input.prevInput = " "; }
+    input.contextMenuPending = rehide;
+    display.selForContextMenu = cm.doc.sel;
+    clearTimeout(display.detectingSelectAll);
+
+    // Select-all will be greyed out if there's nothing to select, so
+    // this adds a zero-width space so that we can later check whether
+    // it got selected.
+    function prepareSelectAllHack() {
+      if (te.selectionStart != null) {
+        var selected = cm.somethingSelected();
+        var extval = "\u200b" + (selected ? te.value : "");
+        te.value = "\u21da"; // Used to catch context-menu undo
+        te.value = extval;
+        input.prevInput = selected ? "" : "\u200b";
+        te.selectionStart = 1; te.selectionEnd = extval.length;
+        // Re-set this, in case some other handler touched the
+        // selection in the meantime.
+        display.selForContextMenu = cm.doc.sel;
+      }
+    }
+    function rehide() {
+      if (input.contextMenuPending != rehide) { return }
+      input.contextMenuPending = false;
+      input.wrapper.style.cssText = oldWrapperCSS;
+      te.style.cssText = oldCSS;
+      if (ie && ie_version < 9) { display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos); }
+
+      // Try to detect the user choosing select-all
+      if (te.selectionStart != null) {
+        if (!ie || (ie && ie_version < 9)) { prepareSelectAllHack(); }
+        var i = 0, poll = function () {
+          if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
+              te.selectionEnd > 0 && input.prevInput == "\u200b") {
+            operation(cm, selectAll)(cm);
+          } else if (i++ < 10) {
+            display.detectingSelectAll = setTimeout(poll, 500);
+          } else {
+            display.selForContextMenu = null;
+            display.input.reset();
+          }
+        };
+        display.detectingSelectAll = setTimeout(poll, 200);
+      }
+    }
+
+    if (ie && ie_version >= 9) { prepareSelectAllHack(); }
+    if (captureRightClick) {
+      e_stop(e);
+      var mouseup = function () {
+        off(window, "mouseup", mouseup);
+        setTimeout(rehide, 20);
+      };
+      on(window, "mouseup", mouseup);
+    } else {
+      setTimeout(rehide, 50);
+    }
+  };
+
+  TextareaInput.prototype.readOnlyChanged = function (val) {
+    if (!val) { this.reset(); }
+    this.textarea.disabled = val == "nocursor";
+  };
+
+  TextareaInput.prototype.setUneditable = function () {};
+
+  TextareaInput.prototype.needsContentAttribute = false;
+
+  function fromTextArea(textarea, options) {
+    options = options ? copyObj(options) : {};
+    options.value = textarea.value;
+    if (!options.tabindex && textarea.tabIndex)
+      { options.tabindex = textarea.tabIndex; }
+    if (!options.placeholder && textarea.placeholder)
+      { options.placeholder = textarea.placeholder; }
+    // Set autofocus to true if this textarea is focused, or if it has
+    // autofocus and no other element is focused.
+    if (options.autofocus == null) {
+      var hasFocus = activeElt();
+      options.autofocus = hasFocus == textarea ||
+        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
+    }
+
+    function save() {textarea.value = cm.getValue();}
+
+    var realSubmit;
+    if (textarea.form) {
+      on(textarea.form, "submit", save);
+      // Deplorable hack to make the submit method do the right thing.
+      if (!options.leaveSubmitMethodAlone) {
+        var form = textarea.form;
+        realSubmit = form.submit;
+        try {
+          var wrappedSubmit = form.submit = function () {
+            save();
+            form.submit = realSubmit;
+            form.submit();
+            form.submit = wrappedSubmit;
+          };
+        } catch(e) {}
+      }
+    }
+
+    options.finishInit = function (cm) {
+      cm.save = save;
+      cm.getTextArea = function () { return textarea; };
+      cm.toTextArea = function () {
+        cm.toTextArea = isNaN; // Prevent this from being ran twice
+        save();
+        textarea.parentNode.removeChild(cm.getWrapperElement());
+        textarea.style.display = "";
+        if (textarea.form) {
+          off(textarea.form, "submit", save);
+          if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function")
+            { textarea.form.submit = realSubmit; }
+        }
+      };
+    };
+
+    textarea.style.display = "none";
+    var cm = CodeMirror(function (node) { return textarea.parentNode.insertBefore(node, textarea.nextSibling); },
+      options);
+    return cm
+  }
+
+  function addLegacyProps(CodeMirror) {
+    CodeMirror.off = off;
+    CodeMirror.on = on;
+    CodeMirror.wheelEventPixels = wheelEventPixels;
+    CodeMirror.Doc = Doc;
+    CodeMirror.splitLines = splitLinesAuto;
+    CodeMirror.countColumn = countColumn;
+    CodeMirror.findColumn = findColumn;
+    CodeMirror.isWordChar = isWordCharBasic;
+    CodeMirror.Pass = Pass;
+    CodeMirror.signal = signal;
+    CodeMirror.Line = Line;
+    CodeMirror.changeEnd = changeEnd;
+    CodeMirror.scrollbarModel = scrollbarModel;
+    CodeMirror.Pos = Pos;
+    CodeMirror.cmpPos = cmp;
+    CodeMirror.modes = modes;
+    CodeMirror.mimeModes = mimeModes;
+    CodeMirror.resolveMode = resolveMode;
+    CodeMirror.getMode = getMode;
+    CodeMirror.modeExtensions = modeExtensions;
+    CodeMirror.extendMode = extendMode;
+    CodeMirror.copyState = copyState;
+    CodeMirror.startState = startState;
+    CodeMirror.innerMode = innerMode;
+    CodeMirror.commands = commands;
+    CodeMirror.keyMap = keyMap;
+    CodeMirror.keyName = keyName;
+    CodeMirror.isModifierKey = isModifierKey;
+    CodeMirror.lookupKey = lookupKey;
+    CodeMirror.normalizeKeyMap = normalizeKeyMap;
+    CodeMirror.StringStream = StringStream;
+    CodeMirror.SharedTextMarker = SharedTextMarker;
+    CodeMirror.TextMarker = TextMarker;
+    CodeMirror.LineWidget = LineWidget;
+    CodeMirror.e_preventDefault = e_preventDefault;
+    CodeMirror.e_stopPropagation = e_stopPropagation;
+    CodeMirror.e_stop = e_stop;
+    CodeMirror.addClass = addClass;
+    CodeMirror.contains = contains;
+    CodeMirror.rmClass = rmClass;
+    CodeMirror.keyNames = keyNames;
+  }
+
+  // EDITOR CONSTRUCTOR
+
+  defineOptions(CodeMirror);
+
+  addEditorMethods(CodeMirror);
+
+  // Set up methods on CodeMirror's prototype to redirect to the editor's document.
+  var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
+  for (var prop in Doc.prototype) { if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
+    { CodeMirror.prototype[prop] = (function(method) {
+      return function() {return method.apply(this.doc, arguments)}
+    })(Doc.prototype[prop]); } }
+
+  eventMixin(Doc);
+  CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
+
+  // Extra arguments are stored as the mode's dependencies, which is
+  // used by (legacy) mechanisms like loadmode.js to automatically
+  // load a mode. (Preferred mechanism is the require/define calls.)
+  CodeMirror.defineMode = function(name/*, mode, …*/) {
+    if (!CodeMirror.defaults.mode && name != "null") { CodeMirror.defaults.mode = name; }
+    defineMode.apply(this, arguments);
+  };
+
+  CodeMirror.defineMIME = defineMIME;
+
+  // Minimal default mode.
+  CodeMirror.defineMode("null", function () { return ({token: function (stream) { return stream.skipToEnd(); }}); });
+  CodeMirror.defineMIME("text/plain", "null");
+
+  // EXTENSIONS
+
+  CodeMirror.defineExtension = function (name, func) {
+    CodeMirror.prototype[name] = func;
+  };
+  CodeMirror.defineDocExtension = function (name, func) {
+    Doc.prototype[name] = func;
+  };
+
+  CodeMirror.fromTextArea = fromTextArea;
+
+  addLegacyProps(CodeMirror);
+
+  CodeMirror.version = "5.50.0";
+
+  return CodeMirror;
+
+})));
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/scripts/show-hint.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/scripts/show-hint.js
new file mode 100644
index 0000000..d70b2ab
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/scripts/show-hint.js
@@ -0,0 +1,460 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
+  var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
+
+  // This is the old interface, kept around for now to stay
+  // backwards-compatible.
+  CodeMirror.showHint = function(cm, getHints, options) {
+    if (!getHints) return cm.showHint(options);
+    if (options && options.async) getHints.async = true;
+    var newOpts = {hint: getHints};
+    if (options) for (var prop in options) newOpts[prop] = options[prop];
+    return cm.showHint(newOpts);
+  };
+
+  CodeMirror.defineExtension("showHint", function(options) {
+    options = parseOptions(this, this.getCursor("start"), options);
+    var selections = this.listSelections()
+    if (selections.length > 1) return;
+    // By default, don't allow completion when something is selected.
+    // A hint function can have a `supportsSelection` property to
+    // indicate that it can handle selections.
+    if (this.somethingSelected()) {
+      if (!options.hint.supportsSelection) return;
+      // Don't try with cross-line selections
+      for (var i = 0; i < selections.length; i++)
+        if (selections[i].head.line != selections[i].anchor.line) return;
+    }
+
+    if (this.state.completionActive) this.state.completionActive.close();
+    var completion = this.state.completionActive = new Completion(this, options);
+    if (!completion.options.hint) return;
+
+    CodeMirror.signal(this, "startCompletion", this);
+    completion.update(true);
+  });
+
+  CodeMirror.defineExtension("closeHint", function() {
+    if (this.state.completionActive) this.state.completionActive.close()
+  })
+
+  function Completion(cm, options) {
+    this.cm = cm;
+    this.options = options;
+    this.widget = null;
+    this.debounce = 0;
+    this.tick = 0;
+    this.startPos = this.cm.getCursor("start");
+    this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length;
+
+    var self = this;
+    cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
+  }
+
+  var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
+    return setTimeout(fn, 1000/60);
+  };
+  var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
+
+  Completion.prototype = {
+    close: function() {
+      if (!this.active()) return;
+      this.cm.state.completionActive = null;
+      this.tick = null;
+      this.cm.off("cursorActivity", this.activityFunc);
+
+      if (this.widget && this.data) CodeMirror.signal(this.data, "close");
+      if (this.widget) this.widget.close();
+      CodeMirror.signal(this.cm, "endCompletion", this.cm);
+    },
+
+    active: function() {
+      return this.cm.state.completionActive == this;
+    },
+
+    pick: function(data, i) {
+      var completion = data.list[i];
+      if (completion.hint) completion.hint(this.cm, data, completion);
+      else this.cm.replaceRange(getText(completion), completion.from || data.from,
+                                completion.to || data.to, "complete");
+      CodeMirror.signal(data, "pick", completion);
+      this.close();
+    },
+
+    cursorActivity: function() {
+      if (this.debounce) {
+        cancelAnimationFrame(this.debounce);
+        this.debounce = 0;
+      }
+
+      var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
+      if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
+          pos.ch < this.startPos.ch || this.cm.somethingSelected() ||
+          (!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
+        this.close();
+      } else {
+        var self = this;
+        this.debounce = requestAnimationFrame(function() {self.update();});
+        if (this.widget) this.widget.disable();
+      }
+    },
+
+    update: function(first) {
+      if (this.tick == null) return
+      var self = this, myTick = ++this.tick
+      fetchHints(this.options.hint, this.cm, this.options, function(data) {
+        if (self.tick == myTick) self.finishUpdate(data, first)
+      })
+    },
+
+    finishUpdate: function(data, first) {
+      if (this.data) CodeMirror.signal(this.data, "update");
+
+      var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
+      if (this.widget) this.widget.close();
+
+      this.data = data;
+
+      if (data && data.list.length) {
+        if (picked && data.list.length == 1) {
+          this.pick(data, 0);
+        } else {
+          this.widget = new Widget(this, data);
+          CodeMirror.signal(data, "shown");
+        }
+      }
+    }
+  };
+
+  function parseOptions(cm, pos, options) {
+    var editor = cm.options.hintOptions;
+    var out = {};
+    for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
+    if (editor) for (var prop in editor)
+      if (editor[prop] !== undefined) out[prop] = editor[prop];
+    if (options) for (var prop in options)
+      if (options[prop] !== undefined) out[prop] = options[prop];
+    if (out.hint.resolve) out.hint = out.hint.resolve(cm, pos)
+    return out;
+  }
+
+  function getText(completion) {
+    if (typeof completion == "string") return completion;
+    else return completion.text;
+  }
+
+  function buildKeyMap(completion, handle) {
+    var baseMap = {
+      Up: function() {handle.moveFocus(-1);},
+      Down: function() {handle.moveFocus(1);},
+      PageUp: function() {handle.moveFocus(-handle.menuSize() + 1, true);},
+      PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
+      Home: function() {handle.setFocus(0);},
+      End: function() {handle.setFocus(handle.length - 1);},
+      Enter: handle.pick,
+      Tab: handle.pick,
+      Esc: handle.close
+    };
+
+    var mac = /Mac/.test(navigator.platform);
+
+    if (mac) {
+      baseMap["Ctrl-P"] = function() {handle.moveFocus(-1);};
+      baseMap["Ctrl-N"] = function() {handle.moveFocus(1);};
+    }
+
+    var custom = completion.options.customKeys;
+    var ourMap = custom ? {} : baseMap;
+    function addBinding(key, val) {
+      var bound;
+      if (typeof val != "string")
+        bound = function(cm) { return val(cm, handle); };
+      // This mechanism is deprecated
+      else if (baseMap.hasOwnProperty(val))
+        bound = baseMap[val];
+      else
+        bound = val;
+      ourMap[key] = bound;
+    }
+    if (custom)
+      for (var key in custom) if (custom.hasOwnProperty(key))
+        addBinding(key, custom[key]);
+    var extra = completion.options.extraKeys;
+    if (extra)
+      for (var key in extra) if (extra.hasOwnProperty(key))
+        addBinding(key, extra[key]);
+    return ourMap;
+  }
+
+  function getHintElement(hintsElement, el) {
+    while (el && el != hintsElement) {
+      if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el;
+      el = el.parentNode;
+    }
+  }
+
+  function Widget(completion, data) {
+    this.completion = completion;
+    this.data = data;
+    this.picked = false;
+    var widget = this, cm = completion.cm;
+    var ownerDocument = cm.getInputField().ownerDocument;
+    var parentWindow = ownerDocument.defaultView || ownerDocument.parentWindow;
+
+    var hints = this.hints = ownerDocument.createElement("ul");
+    var theme = completion.cm.options.theme;
+    hints.className = "CodeMirror-hints " + theme;
+    this.selectedHint = data.selectedHint || 0;
+
+    var completions = data.list;
+    for (var i = 0; i < completions.length; ++i) {
+      var elt = hints.appendChild(ownerDocument.createElement("li")), cur = completions[i];
+      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
+      if (cur.className != null) className = cur.className + " " + className;
+      elt.className = className;
+      if (cur.render) cur.render(elt, data, cur);
+      else elt.appendChild(ownerDocument.createTextNode(cur.displayText || getText(cur)));
+      elt.hintId = i;
+    }
+
+    var container = completion.options.container || ownerDocument.body;
+    var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
+    var left = pos.left, top = pos.bottom, below = true;
+    var offsetLeft = 0, offsetTop = 0;
+    if (container !== ownerDocument.body) {
+      // We offset the cursor position because left and top are relative to the offsetParent's top left corner.
+      var isContainerPositioned = ['absolute', 'relative', 'fixed'].indexOf(parentWindow.getComputedStyle(container).position) !== -1;
+      var offsetParent = isContainerPositioned ? container : container.offsetParent;
+      var offsetParentPosition = offsetParent.getBoundingClientRect();
+      var bodyPosition = ownerDocument.body.getBoundingClientRect();
+      offsetLeft = (offsetParentPosition.left - bodyPosition.left - offsetParent.scrollLeft);
+      offsetTop = (offsetParentPosition.top - bodyPosition.top - offsetParent.scrollTop);
+    }
+    hints.style.left = (left - offsetLeft) + "px";
+    hints.style.top = (top - offsetTop) + "px";
+
+    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
+    var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth);
+    var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight);
+    container.appendChild(hints);
+    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
+    var scrolls = hints.scrollHeight > hints.clientHeight + 1
+    var startScroll = cm.getScrollInfo();
+
+    if (overlapY > 0) {
+      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
+      if (curTop - height > 0) { // Fits above cursor
+        hints.style.top = (top = pos.top - height - offsetTop) + "px";
+        below = false;
+      } else if (height > winH) {
+        hints.style.height = (winH - 5) + "px";
+        hints.style.top = (top = pos.bottom - box.top - offsetTop) + "px";
+        var cursor = cm.getCursor();
+        if (data.from.ch != cursor.ch) {
+          pos = cm.cursorCoords(cursor);
+          hints.style.left = (left = pos.left - offsetLeft) + "px";
+          box = hints.getBoundingClientRect();
+        }
+      }
+    }
+    var overlapX = box.right - winW;
+    if (overlapX > 0) {
+      if (box.right - box.left > winW) {
+        hints.style.width = (winW - 5) + "px";
+        overlapX -= (box.right - box.left) - winW;
+      }
+      hints.style.left = (left = pos.left - overlapX - offsetLeft) + "px";
+    }
+    if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)
+      node.style.paddingRight = cm.display.nativeBarWidth + "px"
+
+    cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
+      moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
+      setFocus: function(n) { widget.changeActive(n); },
+      menuSize: function() { return widget.screenAmount(); },
+      length: completions.length,
+      close: function() { completion.close(); },
+      pick: function() { widget.pick(); },
+      data: data
+    }));
+
+    if (completion.options.closeOnUnfocus) {
+      var closingOnBlur;
+      cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
+      cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
+    }
+
+    cm.on("scroll", this.onScroll = function() {
+      var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
+      var newTop = top + startScroll.top - curScroll.top;
+      var point = newTop - (parentWindow.pageYOffset || (ownerDocument.documentElement || ownerDocument.body).scrollTop);
+      if (!below) point += hints.offsetHeight;
+      if (point <= editor.top || point >= editor.bottom) return completion.close();
+      hints.style.top = newTop + "px";
+      hints.style.left = (left + startScroll.left - curScroll.left) + "px";
+    });
+
+    CodeMirror.on(hints, "dblclick", function(e) {
+      var t = getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
+    });
+
+    CodeMirror.on(hints, "click", function(e) {
+      var t = getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {
+        widget.changeActive(t.hintId);
+        if (completion.options.completeOnSingleClick) widget.pick();
+      }
+    });
+
+    CodeMirror.on(hints, "mousedown", function() {
+      setTimeout(function(){cm.focus();}, 20);
+    });
+
+    CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]);
+    return true;
+  }
+
+  Widget.prototype = {
+    close: function() {
+      if (this.completion.widget != this) return;
+      this.completion.widget = null;
+      this.hints.parentNode.removeChild(this.hints);
+      this.completion.cm.removeKeyMap(this.keyMap);
+
+      var cm = this.completion.cm;
+      if (this.completion.options.closeOnUnfocus) {
+        cm.off("blur", this.onBlur);
+        cm.off("focus", this.onFocus);
+      }
+      cm.off("scroll", this.onScroll);
+    },
+
+    disable: function() {
+      this.completion.cm.removeKeyMap(this.keyMap);
+      var widget = this;
+      this.keyMap = {Enter: function() { widget.picked = true; }};
+      this.completion.cm.addKeyMap(this.keyMap);
+    },
+
+    pick: function() {
+      this.completion.pick(this.data, this.selectedHint);
+    },
+
+    changeActive: function(i, avoidWrap) {
+      if (i >= this.data.list.length)
+        i = avoidWrap ? this.data.list.length - 1 : 0;
+      else if (i < 0)
+        i = avoidWrap ? 0  : this.data.list.length - 1;
+      if (this.selectedHint == i) return;
+      var node = this.hints.childNodes[this.selectedHint];
+      if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+      node = this.hints.childNodes[this.selectedHint = i];
+      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
+      if (node.offsetTop < this.hints.scrollTop)
+        this.hints.scrollTop = node.offsetTop - 3;
+      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
+        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
+      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
+    },
+
+    screenAmount: function() {
+      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
+    }
+  };
+
+  function applicableHelpers(cm, helpers) {
+    if (!cm.somethingSelected()) return helpers
+    var result = []
+    for (var i = 0; i < helpers.length; i++)
+      if (helpers[i].supportsSelection) result.push(helpers[i])
+    return result
+  }
+
+  function fetchHints(hint, cm, options, callback) {
+    if (hint.async) {
+      hint(cm, callback, options)
+    } else {
+      var result = hint(cm, options)
+      if (result && result.then) result.then(callback)
+      else callback(result)
+    }
+  }
+
+  function resolveAutoHints(cm, pos) {
+    var helpers = cm.getHelpers(pos, "hint"), words
+    if (helpers.length) {
+      var resolved = function(cm, callback, options) {
+        var app = applicableHelpers(cm, helpers);
+        function run(i) {
+          if (i == app.length) return callback(null)
+          fetchHints(app[i], cm, options, function(result) {
+            if (result && result.list.length > 0) callback(result)
+            else run(i + 1)
+          })
+        }
+        run(0)
+      }
+      resolved.async = true
+      resolved.supportsSelection = true
+      return resolved
+    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
+      return function(cm) { return CodeMirror.hint.fromList(cm, {words: words}) }
+    } else if (CodeMirror.hint.anyword) {
+      return function(cm, options) { return CodeMirror.hint.anyword(cm, options) }
+    } else {
+      return function() {}
+    }
+  }
+
+  CodeMirror.registerHelper("hint", "auto", {
+    resolve: resolveAutoHints
+  });
+
+  CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur)
+    var term, from = CodeMirror.Pos(cur.line, token.start), to = cur
+    if (token.start < cur.ch && /\w/.test(token.string.charAt(cur.ch - token.start - 1))) {
+      term = token.string.substr(0, cur.ch - token.start)
+    } else {
+      term = ""
+      from = cur
+    }
+    var found = [];
+    for (var i = 0; i < options.words.length; i++) {
+      var word = options.words[i];
+      if (word.slice(0, term.length) == term)
+        found.push(word);
+    }
+
+    if (found.length) return {list: found, from: from, to: to};
+  });
+
+  CodeMirror.commands.autocomplete = CodeMirror.showHint;
+
+  var defaultOptions = {
+    hint: CodeMirror.hint.auto,
+    completeSingle: true,
+    alignWithWord: true,
+    closeCharacters: /[\s()\[\]{};:>,]/,
+    closeOnUnfocus: true,
+    completeOnSingleClick: true,
+    container: null,
+    customKeys: null,
+    extraKeys: null
+  };
+
+  CodeMirror.defineOption("hintOptions", null);
+});
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/codemirror.css b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/codemirror.css
new file mode 100755
index 0000000..bc910fb
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/codemirror.css
@@ -0,0 +1,349 @@
+/* BASICS */
+
+.CodeMirror {
+  /* Set height, width, borders, and global font properties here */
+  font-family: monospace;
+  height: 300px;
+  color: black;
+  direction: ltr;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+  padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+  padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+  border-right: 1px solid #ddd;
+  background-color: #f7f7f7;
+  white-space: nowrap;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+  padding: 0 3px 0 5px;
+  min-width: 20px;
+  text-align: right;
+  color: #999;
+  white-space: nowrap;
+}
+
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
+/* CURSOR */
+
+.CodeMirror-cursor {
+  border-left: 1px solid black;
+  border-right: none;
+  width: 0;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+  border-left: 1px solid silver;
+}
+.cm-fat-cursor .CodeMirror-cursor {
+  width: auto;
+  border: 0 !important;
+  background: #7e7;
+}
+.cm-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+.cm-fat-cursor-mark {
+  background-color: rgba(20, 255, 20, 0.5);
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+}
+.cm-animate-fat-cursor {
+  width: auto;
+  border: 0;
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+  background-color: #7e7;
+}
+@-moz-keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+@-webkit-keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+@keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror-overwrite .CodeMirror-cursor {}
+
+.cm-tab { display: inline-block; text-decoration: inherit; }
+
+.CodeMirror-rulers {
+  position: absolute;
+  left: 0; right: 0; top: -50px; bottom: 0;
+  overflow: hidden;
+}
+.CodeMirror-ruler {
+  border-left: 1px solid #ccc;
+  top: 0; bottom: 0;
+  position: absolute;
+}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
+.cm-s-default .cm-keyword {color: #708;}
+.cm-s-default .cm-atom {color: #219;}
+.cm-s-default .cm-number {color: #164;}
+.cm-s-default .cm-def {color: #00f;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
+.cm-s-default .cm-variable-2 {color: #05a;}
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
+.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-string {color: #a11;}
+.cm-s-default .cm-string-2 {color: #f50;}
+.cm-s-default .cm-meta {color: #555;}
+.cm-s-default .cm-qualifier {color: #555;}
+.cm-s-default .cm-builtin {color: #30a;}
+.cm-s-default .cm-bracket {color: #997;}
+.cm-s-default .cm-tag {color: #170;}
+.cm-s-default .cm-attribute {color: #00c;}
+.cm-s-default .cm-hr {color: #999;}
+.cm-s-default .cm-link {color: #00c;}
+
+.cm-s-default .cm-error {color: #f00;}
+.cm-invalidchar {color: #f00;}
+
+.CodeMirror-composing { border-bottom: 2px solid; }
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0b0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
+.CodeMirror-activeline-background {background: #e8f2ff;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+  position: relative;
+  overflow: hidden;
+  background: white;
+}
+
+.CodeMirror-scroll {
+  overflow: scroll !important; /* Things will break if this is overridden */
+  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* See overflow: hidden in .CodeMirror */
+  margin-bottom: -30px; margin-right: -30px;
+  padding-bottom: 30px;
+  height: 100%;
+  outline: none; /* Prevent dragging from highlighting the element */
+  position: relative;
+}
+.CodeMirror-sizer {
+  position: relative;
+  border-right: 30px solid transparent;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actual scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  position: absolute;
+  z-index: 6;
+  display: none;
+}
+.CodeMirror-vscrollbar {
+  right: 0; top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+  bottom: 0; left: 0;
+  overflow-y: hidden;
+  overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+  right: 0; bottom: 0;
+}
+.CodeMirror-gutter-filler {
+  left: 0; bottom: 0;
+}
+
+.CodeMirror-gutters {
+  position: absolute; left: 0; top: 0;
+  min-height: 100%;
+  z-index: 3;
+}
+.CodeMirror-gutter {
+  white-space: normal;
+  height: 100%;
+  display: inline-block;
+  vertical-align: top;
+  margin-bottom: -30px;
+}
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  background: none !important;
+  border: none !important;
+}
+.CodeMirror-gutter-background {
+  position: absolute;
+  top: 0; bottom: 0;
+  z-index: 4;
+}
+.CodeMirror-gutter-elt {
+  position: absolute;
+  cursor: default;
+  z-index: 4;
+}
+.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
+.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
+
+.CodeMirror-lines {
+  cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
+}
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+  /* Reset some styles that the rest of the page might have set */
+  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
+  border-width: 0;
+  background: transparent;
+  font-family: inherit;
+  font-size: inherit;
+  margin: 0;
+  white-space: pre;
+  word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+  z-index: 2;
+  position: relative;
+  overflow: visible;
+  -webkit-tap-highlight-color: transparent;
+  -webkit-font-variant-ligatures: contextual;
+  font-variant-ligatures: contextual;
+}
+.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-line-like {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
+}
+
+.CodeMirror-linebackground {
+  position: absolute;
+  left: 0; right: 0; top: 0; bottom: 0;
+  z-index: 0;
+}
+
+.CodeMirror-linewidget {
+  position: relative;
+  z-index: 2;
+  padding: 0.1px; /* Force widget margins to stay inside of the container */
+}
+
+.CodeMirror-widget {}
+
+.CodeMirror-rtl pre { direction: rtl; }
+
+.CodeMirror-code {
+  outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+.CodeMirror-measure {
+  position: absolute;
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  visibility: hidden;
+}
+
+.CodeMirror-cursor {
+  position: absolute;
+  pointer-events: none;
+}
+.CodeMirror-measure pre { position: static; }
+
+div.CodeMirror-cursors {
+  visibility: hidden;
+  position: relative;
+  z-index: 3;
+}
+div.CodeMirror-dragcursors {
+  visibility: visible;
+}
+
+.CodeMirror-focused div.CodeMirror-cursors {
+  visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+.CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
+
+.cm-searching {
+  background-color: #ffa;
+  background-color: rgba(255, 255, 0, .4);
+}
+
+/* Used to force a border model for a node */
+.cm-force-border { padding-right: .1px; }
+
+@media print {
+  /* Hide the cursor when printing */
+  .CodeMirror div.CodeMirror-cursors {
+    visibility: hidden;
+  }
+}
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/docs.css b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/docs.css
new file mode 100644
index 0000000..17b9212
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/docs.css
@@ -0,0 +1,274 @@
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(//themes.googleusercontent.com/static/fonts/sourcesanspro/v5/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff) format('woff');
+}
+
+body, html { margin: 0; padding: 0; height: 100%; }
+section, article { display: block; padding: 0; }
+
+body {
+  background: #f8f8f8;
+  font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+}
+
+p { margin-top: 0; }
+
+h2, h3, h1 {
+  font-weight: normal;
+  margin-bottom: .7em;
+}
+h1 { font-size: 140%; }
+h2 { font-size: 120%; }
+h3 { font-size: 110%; }
+article > h2:first-child, section:first-child > h2 { margin-top: 0; }
+
+#nav h1 {
+  margin-right: 12px;
+  margin-top: 0;
+  margin-bottom: 2px;
+  color: #d30707;
+  letter-spacing: .5px;
+}
+
+a, a:visited, a:link, .quasilink {
+  color: #A21313;
+}
+
+em {
+  padding-right: 2px;
+}
+
+.quasilink {
+  cursor: pointer;
+}
+
+article {
+  max-width: 700px;
+  margin: 0 0 0 160px;
+  border-left: 2px solid #E30808;
+  border-right: 1px solid #ddd;
+  padding: 30px 50px 100px 50px;
+  background: white;
+  z-index: 2;
+  position: relative;
+  min-height: 100%;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+}
+
+#nav {
+  position: fixed;
+  padding-top: 30px;
+  max-height: 100%;
+  box-sizing: -moz-border-box;
+  box-sizing: border-box;
+  overflow-y: auto;
+  left: 0; right: none;
+  width: 160px;
+  text-align: right;
+  z-index: 1;
+}
+
+@media screen and (min-width: 1000px) {
+  article {
+    margin: 0 auto;
+  }
+  #nav {
+    right: 50%;
+    width: auto;
+    border-right: 349px solid transparent;
+  }
+}
+
+#nav ul {
+  display: block;
+  margin: 0; padding: 0;
+  margin-bottom: 32px;
+}
+
+#nav a {
+  text-decoration: none;
+}
+
+#nav li {
+  display: block;
+  margin-bottom: 4px;
+}
+
+#nav li ul {
+  font-size: 80%;
+  margin-bottom: 0;
+  display: none;
+}
+
+#nav li.active ul {
+  display: block;
+}
+
+#nav li li a {
+  padding-right: 20px;
+  display: inline-block;
+}
+
+#nav ul a {
+  color: black;
+  padding: 0 7px 1px 11px;
+}
+
+#nav ul a.active, #nav ul a:hover {
+  border-bottom: 1px solid #E30808;
+  margin-bottom: -1px;
+  color: #E30808;
+}
+
+#logo {
+  border: 0;
+  margin-right: 12px;
+  margin-bottom: 25px;
+}
+
+section {
+  border-top: 1px solid #E30808;
+  margin: 1.5em 0;
+}
+
+section.first {
+  border: none;
+  margin-top: 0;
+}
+
+#demo {
+  position: relative;
+}
+
+#demolist {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  z-index: 25;
+}
+
+.yinyang {
+  position: absolute;
+  top: -10px;
+  left: 0; right: 0;
+  margin: auto;
+  display: block;
+  height: 120px;
+}
+
+.actions {
+  margin: 1em 0 0;
+  min-height: 100px;
+  position: relative;
+}
+
+.actionspicture {
+  pointer-events: none;
+  position: absolute;
+  height: 100px;
+  top: 0; left: 0; right: 0;
+}
+
+.actionlink {
+  pointer-events: auto;
+  font-family: arial;
+  font-size: 80%;
+  font-weight: bold;
+  position: absolute;
+  top: 0; bottom: 0;
+  line-height: 1;
+  height: 1em;
+  margin: auto;
+}
+
+.actionlink.download {
+  color: white;
+  right: 50%;
+  margin-right: 13px;
+  text-shadow: -1px 1px 3px #b00, -1px -1px 3px #b00, 1px 0px 3px #b00;
+}
+
+.actionlink.fund {
+  color: #b00;
+  left: 50%;
+  margin-left: 15px;
+}
+
+.actionlink:hover {
+  text-decoration: underline;
+}
+
+.actionlink a {
+  color: inherit;
+}
+
+.actionsleft {
+  float: left;
+}
+
+.actionsright {
+  float: right;
+  text-align: right;
+}
+
+@media screen and (max-width: 800px) {
+  .actions {
+    padding-top: 120px;
+  }
+  .actionsleft, .actionsright {
+    float: none;
+    text-align: left;
+    margin-bottom: 1em;
+  }
+}
+
+th {
+  text-decoration: underline;
+  font-weight: normal;
+  text-align: left;
+}
+
+#features ul {
+  list-style: none;
+  margin: 0 0 1em;
+  padding: 0 0 0 1.2em;
+}
+
+#features li:before {
+  content: "-";
+  width: 1em;
+  display: inline-block;
+  padding: 0;
+  margin: 0;
+  margin-left: -1em;
+}
+
+.rel {
+  margin-bottom: 0;
+}
+.rel-note {
+  margin-top: 0;
+  color: #555;
+}
+
+pre {
+  padding-left: 15px;
+  border-left: 2px solid #ddd;
+}
+
+code {
+  padding: 0 2px;
+}
+
+strong {
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+.field {
+  border: 1px solid #A21313;
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/show-hint.css b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/show-hint.css
new file mode 100644
index 0000000..5617ccc
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/lib/styles/show-hint.css
@@ -0,0 +1,36 @@
+.CodeMirror-hints {
+  position: absolute;
+  z-index: 10;
+  overflow: hidden;
+  list-style: none;
+
+  margin: 0;
+  padding: 2px;
+
+  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  border-radius: 3px;
+  border: 1px solid silver;
+
+  background: white;
+  font-size: 90%;
+  font-family: monospace;
+
+  max-height: 20em;
+  overflow-y: auto;
+}
+
+.CodeMirror-hint {
+  margin: 0;
+  padding: 0 4px;
+  border-radius: 2px;
+  white-space: pre;
+  color: black;
+  cursor: pointer;
+}
+
+li.CodeMirror-hint-active {
+  background: #08f;
+  color: white;
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/autoComplete.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/autoComplete.js
new file mode 100644
index 0000000..07be6ca
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/autoComplete.js
@@ -0,0 +1,126 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+CodeMirror.registerHelper("hint", "umlClass", function (editor, options) {
+    var WORD = /[\w$]+/, RANGE = 500;
+    // Find word, start and end
+    var word = options && options.word || WORD;
+    var range = options && options.range || RANGE;
+
+    var cursor = editor.getCursor();
+
+    var currentLine = cursor.line;
+    var currentColumn = cursor.ch;
+
+    var currentToken = editor.getTokenAt({line: currentLine, ch: currentColumn});
+    var currentWord = currentToken.string;
+    var currentStatePosition = currentToken.state.position;
+    var previousToken = editor.getTokenAt({line: currentLine, ch: currentColumn - currentWord.length});
+
+    var previousStatePosition = previousToken.state.position;
+
+    var originalList;
+    var wordToUse;
+    if (/^( |\t)+/.exec(currentWord)) {
+        originalList = AutoComplete.getProposition(currentLine, currentColumn, currentStatePosition);
+        wordToUse = "";
+    }
+    else {
+        originalList = AutoComplete.getProposition(currentLine, currentColumn - currentWord.length, previousStatePosition);
+        wordToUse = currentWord;
+    }
+
+    var finalList = [];
+
+    log("currentToken.string=|" + currentToken.string + "|");
+    if (wordToUse == "")
+        finalList = originalList;
+    else
+        originalList.forEach(function (item) {
+            if (item.toLowerCase().indexOf(wordToUse.toLowerCase()) != -1)
+                finalList.push(item);
+        });
+    return {
+        list: finalList,
+        from: CodeMirror.Pos(currentLine, currentColumn - currentWord.length + (wordToUse==""?1:0)),
+        to: CodeMirror.Pos(currentLine, currentColumn)
+    };
+});
+
+AccessibleTypes = ["Boolean", "Integer", "String", "Real"];
+AutoComplete = {
+    templates: newObjectWithProperties(
+        States.StartOfDocument, ["class"],
+
+        States.ClassDefStart, ["className"],
+        States.ClassName, [],
+
+        States.Beginning, ["+", "-", "#", "~", "/", "propertyName"],
+        States.Visibility_JustGiven, ["/", "propertyName"],
+        States.Derived_JustGiven, ["propertyName"],
+        States.CaracForName, [":"],
+        States.Name_JustGiven, [":", "("],
+        States.TypeDef_Started, AccessibleTypes,//,"Brasserie","Employe","Menu","StatutEmploye"],
+        States.CaracForTypeName, AccessibleTypes,
+        States.TypeName_JustGiven, ["[0..1]", "[1..1]", "[0..n]", "[1..n]"],
+        States.Multiplicity_JustGiven, ["{"],
+        States.ModifierListStart, ["readOnly", "union", "ordered", "unordered", "unique", "nonunique", "seq", "sequence", "id", "subsets propertyName", "redefines propertyName"],
+        States.ModifierListSeparator, ["readOnly", "union", "ordered", "unordered", "unique", "nonunique", "seq", "sequence", "id", "subsets propertyName", "redefines propertyName"],
+        States.ModifierListEnd, [],
+        States.Modifier, [",", "}"],
+
+
+        // OPERATION / PARAMETER DEFINITION
+
+        States.ParamList_Started, ["in", "out", "inout", "parameterName"],
+        States.ParamDirection_JustGiven, ["parameterName"],
+        States.ParamName_JustGiven, [":"],
+        States.ParamTypeDefStart, AccessibleTypes,
+        States.ParamType_JustGiven, ["[0..1]", "[1..1]", "[0..n]", "[1..n]", "{", ",", ")"],
+        States.ParamMultiplicity_JustGiven, ["{", ",", ")"],
+
+        // param property
+
+        States.ParamPropertyList_Started, ["ordered", "unordered", "unique", "nonunique", "seq", "sequence"],
+        States.ParamProperty_JustGiven, [",", "}"],
+        States.ParamPropertyListSeparator, ["ordered", "unordered", "unique", "nonunique", "seq", "sequence"],
+        States.ParamPropertyListEnd, [",", ")"],
+
+        States.ParamListSeparator, ["in", "out", "inout", "parameterName"],
+        States.ParamListEnd, [":"],
+
+        // return type
+
+        States.ReturnTypeDef_Started, AccessibleTypes,
+        States.ReturnTypeName_JustGiven, ["[0..1]", "[1..1]", "[0..n]", "[1..n]", "{"],
+        States.ReturnTypeMultiplicity, ["{"],
+
+        States.OperationPropertyList_Started, ["ordered", "unordered", "unique", "nonunique", "seq", "sequence", "redefines propertyName"],
+        States.OperationProperty_JustGiven, [",", "}"],
+        States.OperationPropertyListSeparator, ["ordered", "unordered", "unique", "nonunique", "seq", "sequence", "redefines propertyName"],
+        States.OperationPropertyListEnd, []
+    )
+    ,
+    getProposition:
+
+        function (line, column, position) {
+            if (column == 0 && position != States.StartOfDocument)
+                return AutoComplete.templates[States.Beginning];
+            else
+                return AutoComplete.templates[position];
+        }
+}
+;
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/editorStateMachine.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/editorStateMachine.js
new file mode 100644
index 0000000..c6a619c
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/editorStateMachine.js
@@ -0,0 +1,613 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+var lastCharacterWasEndOfLine = false;
+var possibleName = "";
+
+CodeMirror.defineMode("umlClass", function () {
+    return {
+        token: function (stream, state) {
+            window.ZeStream = stream;
+
+            function setStatePosition(position) {
+                if (position != state.position) {
+                    state.tokenStart = {line: stream.lineOracle.line, ch: stream.pos};
+                }
+                state.position = position;
+            }
+
+            function errorDetected() {
+                stream.next();
+                state.errorMessage = Expected[state.position];
+                setStatePosition(States.Error);
+            }
+
+            // If there was an error in the previous iteration
+
+            if (state.position == States.Error) {
+                stream.skipToEnd();
+                setStatePosition(States.Beginning);
+                return "";
+            }
+
+            // If we are at the beginning of a line
+            // to-do : test if there were something to finish at the previous line
+
+            if (stream.sol() && state.position != States.StartOfDocument) {
+                setStatePosition(States.Beginning);
+            }
+
+            var text;
+
+            // ******************************
+            //
+            // CLASS DEFINITION
+            //
+            // ******************************
+
+            if (state.position == States.StartOfDocument) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readClassDefStart(stream)) {
+                    setStatePosition(States.ClassDefStart);
+                    return Types.ClassDefStart;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ClassDefStart) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readClassName(stream)) {
+                    setStatePosition(States.ClassName);
+                    return Types.ClassName;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ClassName) {
+
+                if (stream.eatSpace()) return;
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            // ******************************
+            //
+            // PROPERTY DEFINITION
+            //
+            // ******************************
+
+            if (state.position == States.Beginning) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readVisibility(stream)) {
+                    setStatePosition(States.Visibility_JustGiven);
+                    return Types.Visibility;
+                }
+
+                if (text = readDerived(stream)) {
+                    setStatePosition(States.Derived_JustGiven);
+                    return Types.Derived;
+                }
+
+                if (text = readPropertyName(stream)) {
+                    setStatePosition(States.Name_JustGiven);
+                    return Types.PropertyName;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.Visibility_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readDerived(stream)) {
+                    setStatePosition(States.Derived_JustGiven);
+                    return Types.Derived;
+                }
+
+                if (text = readPropertyName(stream)) {
+                    setStatePosition(States.Name_JustGiven);
+                    return Types.PropertyName;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+            if (state.position == States.Derived_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readPropertyName(stream)) {
+                    setStatePosition(States.Name_JustGiven);
+                    return Types.PropertyName;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.Name_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readAttributeTypeDefStart(stream)) {
+                    setStatePosition(States.TypeDef_Started);
+                    return Types.TypeDefStart;
+                }
+
+                if (text = readAttributeMultiplicity(stream)) {
+                    setStatePosition(States.Multiplicity_JustGiven);
+                    return Types.Multiplicity;
+                }
+
+                if (text = readAttributeModifierListStart(stream)) {
+                    setStatePosition(States.ModifierListStart);
+                    return Types.ModifierList_Started;
+                }
+
+                if (text = readParameterListStart(stream)) {
+                    setStatePosition(States.ParamList_Started);
+                    return Types.ParamList_Started;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            // ******************************
+            //
+            // SWITCH TO ATTRIBUTE DEFINITION
+            //
+            // ******************************
+
+            if (state.position == States.TypeDef_Started) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readAttributeTypeName(stream)) {
+                    setStatePosition(States.TypeName_JustGiven);
+                    return Types.TypeName;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.TypeName_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readAttributeMultiplicity(stream)) {
+                    setStatePosition(States.Multiplicity_JustGiven);
+                    return Types.Multiplicity;
+                }
+
+                if (text = readAttributeModifierListStart(stream)) {
+                    setStatePosition(States.ModifierListStart);
+                    return Types.ModifierList_Started;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.Multiplicity_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readAttributeModifierListStart(stream)) {
+                    setStatePosition(States.ModifierListStart);
+                    return Types.ModifierList_Started;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ModifierListStart) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readAttributeModifier(stream)) {
+                    setStatePosition(States.Modifier);
+                    return Types.Modifier;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.Modifier) {
+
+                stream.eatSpace();
+                if (stream.eol())
+                    return "error";
+
+                if (text = readAttributeModifierListSeparator(stream)) {
+                    setStatePosition(States.ModifierListSeparator);
+                    return Types.ModifierListSeparator;
+                }
+
+                if (text = readAttributeModifierListEnd(stream)) {
+                    setStatePosition(States.ModifierListEnd);
+                    return Types.ModifierListEnd;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ModifierListSeparator) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readAttributeModifier(stream)) {
+                    setStatePosition(States.Modifier);
+                    return Types.Modifier;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ModifierListEnd) {
+
+                if (stream.eatSpace()) return;
+
+                errorDetected();
+                return Types.Error;
+            }
+
+
+            // ******************************
+            //
+            // SWITCH TO OPERATION DEFINITION
+            //
+            // ******************************
+
+            // ******************
+            // LIST OF PARAMETERS
+            // ******************
+
+            if (state.position == States.ParamList_Started) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterDirection(stream)) {
+                    setStatePosition(States.ParamDirection_JustGiven);
+                    return Types.ParamDirection_JustGiven;
+                }
+
+                if (text = readParameterName(stream)) {
+                    setStatePosition(States.ParamName_JustGiven);
+                    return Types.ParamName_JustGiven;
+                }
+
+                if (text = readParameterListEnd(stream)) {
+                    setStatePosition(States.ParamListEnd);
+                    return Types.ParamListEnd;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ParamListSeparator) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterDirection(stream)) {
+                    setStatePosition(States.ParamDirection_JustGiven);
+                    return Types.ParamDirection_JustGiven;
+                }
+
+                if (text = readParameterName(stream)) {
+                    setStatePosition(States.ParamName_JustGiven);
+                    return Types.ParamName_JustGiven;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ParamDirection_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterName(stream)) {
+                    setStatePosition(States.ParamName_JustGiven);
+                    return Types.ParamName_JustGiven;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ParamName_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterTypeDefStart(stream)) {
+                    setStatePosition(States.ParamTypeDefStart);
+                    return Types.ParamTypeDefStart;
+                }
+
+                if (text = readParameterMultiplicity(stream)) {
+                    setStatePosition(States.ParamMultiplicity_JustGiven);
+                    return Types.ParamMultiplicity_JustGiven;
+                }
+
+                if (text = readParameterPropertyListStart(stream)) {
+                    setStatePosition(States.ParamPropertyList_Started);
+                    return Types.ParamPropertyList_Started;
+                }
+
+                if (text = readParameterListSeparator(stream)) {
+                    setStatePosition(States.ParamListSeparator);
+                    return Types.ParamListSeparator;
+                }
+
+                if (text = readParameterListEnd(stream)) {
+                    setStatePosition(States.ParamListEnd);
+                    return Types.ParamListEnd;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ParamTypeDefStart) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterTypeName(stream)) {
+                    setStatePosition(States.ParamType_JustGiven);
+                    return Types.ParamType_JustGiven;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ParamType_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterMultiplicity(stream)) {
+                    setStatePosition(States.ParamMultiplicity_JustGiven);
+                    return Types.ParamMultiplicity_JustGiven;
+                }
+
+                if (text = readParameterPropertyListStart(stream)) {
+                    setStatePosition(States.ParamPropertyList_Started);
+                    return Types.ParamPropertyList_Started;
+                }
+
+                if (text = readParameterListSeparator(stream)) {
+                    setStatePosition(States.ParamListSeparator);
+                    return Types.ParamListSeparator;
+                }
+
+                if (text = readParameterListEnd(stream)) {
+                    setStatePosition(States.ParamListEnd);
+                    return Types.ParamListEnd;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ParamMultiplicity_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterPropertyListStart(stream)) {
+                    setStatePosition(States.ParamPropertyList_Started);
+                    return Types.ParamPropertyList_Started;
+                }
+
+                if (text = readParameterListSeparator(stream)) {
+                    setStatePosition(States.ParamListSeparator);
+                    return Types.ParamListSeparator;
+                }
+
+                if (text = readParameterListEnd(stream)) {
+                    setStatePosition(States.ParamListEnd);
+                    return Types.ParamListEnd;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            // ***********************
+            // PARAMETER PROPERTY LIST
+            // ***********************
+
+            if (state.position == States.ParamPropertyList_Started || state.position == States.ParamPropertyListSeparator) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterProperty(stream)) {
+                    setStatePosition(States.ParamProperty_JustGiven);
+                    return Types.ParamProperty_JustGiven;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ParamProperty_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterPropertyListSeparator(stream)) {
+                    setStatePosition(States.ParamPropertyListSeparator);
+                    return Types.ParamPropertyListSeparator;
+                }
+
+                if (text = readParameterPropertyListEnd(stream)) {
+                    setStatePosition(States.ParamPropertyListEnd);
+                    return Types.ParamPropertyListEnd;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ParamPropertyListEnd) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readParameterListSeparator(stream)) {
+                    setStatePosition(States.ParamListSeparator);
+                    return Types.ParamListSeparator;
+                }
+
+                if (text = readParameterListEnd(stream)) {
+                    setStatePosition(States.ParamListEnd);
+                    return Types.ParamListEnd;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            // ***********************
+            // PARAMETER LIST END
+            // ***********************
+
+            if (state.position == States.ParamListEnd) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readReturnTypeDefStart(stream)) {
+                    setStatePosition(States.ReturnTypeDef_Started);
+                    return Types.ReturnTypeDef_Started;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            // ***********************
+            // RETURN TYPE
+            // ***********************
+
+            if (state.position == States.ReturnTypeDef_Started) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readReturnTypeName(stream)) {
+                    setStatePosition(States.ReturnTypeName_JustGiven);
+                    return Types.ReturnTypeName_JustGiven;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ReturnTypeName_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readReturnTypeMultiplicity(stream)) {
+                    setStatePosition(States.ReturnTypeMultiplicity);
+                    return Types.ReturnTypeMultiplicity;
+                }
+
+                if (text = readOperationPropertyListStart(stream)) {
+                    setStatePosition(States.OperationPropertyList_Started);
+                    return Types.OperationPropertyList_Started;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.ReturnTypeMultiplicity) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readOperationPropertyListStart(stream)) {
+                    setStatePosition(States.OperationPropertyList_Started);
+                    return Types.OperationPropertyList_Started;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            // ************************************
+            // LIST OF PROPERTIES FOR THE OPERATION
+            // ************************************
+
+            if (state.position == States.OperationPropertyList_Started || state.position == States.OperationPropertyListSeparator) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readOperationProperty(stream)) {
+                    setStatePosition(States.OperationProperty_JustGiven);
+                    return Types.OperationProperty_JustGiven;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+            if (state.position == States.OperationProperty_JustGiven) {
+
+                if (stream.eatSpace()) return;
+
+                if (text = readOperationPropertyListSeparator(stream)) {
+                    setStatePosition(States.OperationPropertyListSeparator);
+                    return Types.OperationPropertyListSeparator;
+                }
+
+                if (text = readOperationPropertyListEnd(stream)) {
+                    setStatePosition(States.OperationPropertyListEnd);
+                    return Types.OperationPropertyListEnd;
+                }
+
+                errorDetected();
+                return Types.Error;
+            }
+
+        },
+
+        startState: function () {
+            return {
+                tokenStart: {line: 0, ch: 0},
+                doNotNextChar: false,
+                position: States.StartOfDocument      // Current position, "def", "quote" or "comment"
+
+            };
+        }
+
+    };
+});
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/errorManagment.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/errorManagment.js
new file mode 100644
index 0000000..058c12f
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/errorManagment.js
@@ -0,0 +1,130 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+Errors = {
+    list: [],
+    timeToReact: 600,
+    gutterLabel: "errors",
+    counter: 0,
+    currentlyWorking: false,
+
+    planCheckError: function () {
+        var stamp = ++Errors.counter;
+
+        var idTimer = setInterval(
+            function () {
+                if (stamp == Errors.counter) {
+                    if (Errors.currentlyWorking == true) {
+                        console.log("it's currently under working, so I will wait");
+                    } else {
+                        editor.off("update", Errors.observe);
+                        Errors.currentlyWorking = true;
+                        Errors.clean();
+                        Errors.checkError();
+                        Errors.currentlyWorking = false;
+                        clearInterval(idTimer);
+                        editor.on("update", Errors.observe);
+                    }
+                } else {
+                    clearInterval(idTimer);
+                }
+            }
+            , Errors.timeToReact);
+    },
+
+    checkError: function () {
+        var lines = editor.getValue().split("\n");
+        var lastLineNumber = lines.length - 1;
+        for (var lineNumber = 0; lineNumber <= lastLineNumber; lineNumber++) {
+            var lineTokens = editor.getLineTokens(lineNumber);
+            lineTokens.forEach(
+                function (token) {
+                    if (token.type == Types.Error) {
+                        var errorMessage = token.state.errorMessage;
+                        Errors.list.push(editor.markText({line: lineNumber, ch: token.start}, {
+                            line: lineNumber,
+                            ch: token.start + 2
+                        }, {className: 'line-error', title: errorMessage}));
+                        var gm = editor.setGutterMarker(lineNumber, Errors.gutterLabel, Errors.makeErrorMarker(errorMessage));
+                    }
+                }
+            )
+        }
+    },
+
+    makeErrorMarker: function (errorMessage) {
+        var marker = document.createElement("div");
+        marker.style.color = "#F00";
+        marker.title = errorMessage;
+        marker.style.marginLeft = "5px";
+        marker.innerHTML = "✖";
+        return marker;
+    },
+
+    startObserving: function () {
+        editor.on("update", Errors.observe);
+    },
+    observe: function () {
+        Errors.planCheckError();
+    },
+
+    marks: [],
+    clean: function () {
+        Errors.list = [];
+        var marks = editor.getAllMarks();
+        marks.forEach(function (mark) {
+            mark.clear()
+        });
+        editor.clearGutter(Errors.gutterLabel)
+    },
+    add: function (stream, position) {
+        var error = {
+            line: stream.lineOracle.line,
+            column: stream.column(),
+            label: Expected[position] + " when state was " + StateLabels[position] + " and carac was " + ZeState.character
+        };
+        Errors.list.push(error);
+    },
+    display: function () {
+        Errors.list.forEach(function (error) {
+            Errors.marks.push(editor.markText({line: error.line, ch: error.column}, {
+                line: error.line,
+                ch: error.column + 1
+            }, {className: 'line-error', title: error.label}));
+        });
+    }
+};
+
+Expected = newObjectWithProperties(
+    States.StartOfDocument, "class expected",
+
+    States.ClassDefStart, "className expected",
+    States.ClassName, "CR expected",
+
+    States.Beginning, "+,-,#,~, / or propertyName expected",
+    States.Visibility_JustGiven, "/ or propertyName expected",
+    States.Derived_JustGiven, "propertyName expected",
+    States.CaracForName, "alphanumerical character, : or CR expected",
+    States.Name_JustGiven, ": or CR expected",
+    States.TypeDef_Started, "typeName expected",
+    States.CaracForTypeName, "CR expected",
+    States.TypeName_JustGiven, "CR expected",
+    States.Multiplicity_JustGiven, "CR expected",
+    States.ModifierListStart, "modifier expected",
+    States.ModifierListSeparator, "modifier expected",
+    States.ModifierListEnd, "CR expected",
+    States.Modifier, ", or } expected"
+);
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/javaProxy.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/javaProxy.js
new file mode 100644
index 0000000..3caf180
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/javaProxy.js
@@ -0,0 +1,27 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+function closeAndPerform (classSpecificationInText) {
+	javaTextualEditor.closeAndPerform(classSpecificationInText);
+}
+
+function getAccessibleTypes () {
+	return javaTextualEditor.getAccessibleTypes()
+}
+
+function getProperties () {
+	return javaTextualEditor.getProperties();
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/logFunction.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/logFunction.js
new file mode 100644
index 0000000..9c5a4c4
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/logFunction.js
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+function log (message) {
+    console.log(message);
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/propertyManagment.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/propertyManagment.js
new file mode 100644
index 0000000..174f6f0
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/propertyManagment.js
@@ -0,0 +1,686 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+function writeAListNotNull (array, startChar, endChar) {
+    if (array.length==0)
+        return "";
+    var result=startChar;
+    result+=array[0];
+    for (var i=1;i<array.length;i++) {
+        result+=","+array[i];
+    }
+    result+=endChar;
+    return result;
+}
+
+function writeMultiplicity (object) {
+    if (object.lower == 1 && object.upper == 1)
+        multiplicity = "";
+    else {
+        var lower=object.lower;
+        var upper=object.upper;
+        if (upper==-1)
+            upper="n";
+        multiplicity = "["+lower+".."+upper+"]";
+    }
+
+    return multiplicity;
+}
+
+function writeType (object) {
+    var primitiveTypes = {
+        "PrimitiveTypes::Integer": "Integer",
+        "PrimitiveTypes::String": "String",
+        "PrimitiveTypes::Boolean": "Boolean",
+        "PrimitiveTypes::Real": "Real"
+    };
+    var type = primitiveTypes[object.type];
+    if (!type)
+        type = object.type;
+    if (type.includes(" ")) {
+        type='"'+type+'"';
+    }
+    return type;
+}
+
+function writeName(object) {
+    var name=object.name;
+    if (name.includes(" "))
+        name='"'+name+'"';
+    return name;
+}
+
+
+
+function defaultTemplateForProperty() {
+    return {
+        readOnly: false,
+        ordered: false,
+        unique: true,
+        derivedUnion: false,
+        sequence: false,
+        id: false,
+        redefines: false,
+        subsets: false,
+        lower: 1,
+        upper: 1
+    };
+}
+
+function defaultTemplateForOperation() {
+    return {
+        query: false,
+        unique: true,
+        ordered: false,
+        redefines: false,
+        sequence: false
+    };
+}
+
+function defaultTemplateForOperationParameter() {
+    return {
+        unique: true,
+        ordered: false,
+        sequence: false,
+        lower: 1,
+        upper: 1
+    };
+}
+
+function setMultiplicityFromText(object,value) {
+    if (value != null) {
+        var reg = /^\[(\d)+\.\.(\d+|n|\*)\]/;
+        var values = reg.exec(value);
+        object.lower = parseInt(values[1]);
+        var upper=values[2];
+        if (upper=="*" || upper=="n")
+            upper=-1;
+        else
+            upper=parseInt(values[2]);
+        object.upper = upper;
+    } else {
+        object.lower = 1;
+        object.upper = 1;
+    }
+}
+
+function extractName (name) {
+    if (name.startsWith('"') && name.endsWith('"'))
+        return name.substring(1,name.length-1);
+    else
+        return name;
+}
+Mapping = {
+
+    getTokenOfTypeAtLine: function (type, lineNumber) {
+        var tokens = editor.getLineTokens(lineNumber);
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.type == type) return token;
+        }
+        return null;
+    },
+
+    getTokenOfPositionAtLine: function (position, lineNumber) {
+        var tokens = editor.getLineTokens(lineNumber);
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.state.position == type) return token;
+        }
+        return null;
+    },
+
+    setAccessibleTypes : function (typeList) {
+        typeList.forEach(function (type) {
+            AccessibleTypes.push(type);
+        });
+
+    },
+
+    // ************************
+    //
+    // RECEIVING EXISTING CLASS FROM PAPYRUS
+    //
+    // ************************
+
+    FromPapyrus: {
+
+        // Main method
+        // calls others submethods (properties, operations)
+        // sets the content of the editor with the corresponding test of existing class
+
+        setEditorValueWithClassSpecification: function () {
+            var classSpecification = getProperties(); // java function in Papyrus
+            console.log("live from Javascript");
+            console.log(classSpecification);
+            classSpecification = JSON.parse(classSpecification+"");
+            var name=writeName(classSpecification);
+            var specification = "class "+name;
+            classSpecification.properties.forEach(
+                function (property)  {
+                    specification += "\n" + Mapping.FromPapyrus.propertyFromPapyrus(property);
+                }
+            );
+            classSpecification.operations.forEach(
+                function (operation) {
+                    specification += "\n" + Mapping.FromPapyrus.operationFromPapyrus(operation);
+                }
+            );
+            editor.setValue(specification);
+        },
+
+        // Translates a class property into the textual version
+
+        propertyFromPapyrus: function (propertyObject) {
+            var visibilityKind = {
+                public: "+",
+                private: "-",
+                package: "#",
+                protected: "~"
+            };
+            var name = writeName(propertyObject);
+            var type = writeType(propertyObject);
+
+            var visibility = visibilityKind[propertyObject.visibility];
+            var derived = (propertyObject.derived ? "/" : "");
+            var multiplicity=writeMultiplicity(propertyObject);
+            var result = visibility+derived+" "+name;
+            if (type!="")
+                result+=": "+type;
+
+            result+=" "+multiplicity;
+
+            var modifiers=[];
+            if (propertyObject.readOnly)
+                modifiers.push("readOnly");
+            if (propertyObject.derivedUnion)
+                modifiers.push("union");
+            if (propertyObject.ordered)
+                modifiers.push("ordered");
+            if (!propertyObject.unique)
+                modifiers.push("nonunique");
+            if (propertyObject.id)
+                modifiers.push("id");
+
+            result+=writeAListNotNull(modifiers,"{","}");
+
+            return result;
+        },
+
+        // Translates a class operation into the textual version
+
+        operationFromPapyrus: function (operationObject) {
+            var visibilityKind = {
+                public: "+",
+                private: "-",
+                package: "#",
+                protected: "~"
+            };
+
+            var visibility = visibilityKind[operationObject.visibility];
+            var name=writeName(operationObject)
+            var result = visibility+" "+name;
+
+            var returnDef = "";
+            var parameterList = [];
+
+            operationObject.parameters.forEach(
+                function (parameter) {
+                    if (parameter.direction!="return") {
+                        var parameterText="";
+                        if (parameter.direction!="in")
+                            parameterText+=parameter.direction+" ";
+                        parameterText+=writeName(parameter);
+                        parameterText+=" : "+writeType(parameter);
+                        parameterText+=writeMultiplicity(parameter);
+                        var propertyList = Mapping.FromPapyrus.parameterPropertyListFromPapyrus(parameter);
+                        parameterText+=propertyList;
+                        parameterList.push(parameterText);
+                    }
+                    else {
+                        returnDef+=" : "+writeType(parameter);
+                        returnDef+=writeMultiplicity(parameter);
+                        returnDef+=Mapping.FromPapyrus.parameterPropertyListFromPapyrus(parameter);
+                    }
+                }
+            );
+            parameterList="("+writeAListNotNull(parameterList,"","")+")";
+            return result+parameterList+returnDef;
+
+            return result;
+        },
+
+        parameterPropertyListFromPapyrus : function (parameter) {
+            var propertyList=[];
+            if (parameter.ordered)
+                propertyList.push("ordered");
+            if (!parameter.unique)
+                propertyList.push("nonunique");
+            return writeAListNotNull(propertyList,"{","}");
+        }
+    },
+
+
+    // ************************
+    //
+    // CONVERTING TEXTUAL CLASS SPECIFICATION TO A STRUCTURE DEDICATED TO PAPYRUS MAPPING
+    //
+    // ************************
+
+    ToPapyrus: {
+
+        // Main Method
+        // calls submethods (properties, operations)
+        // returns a JSON-format specification
+
+        returnClassSpecificationToPapyrus: function () {
+
+            var classSpecification = {properties:[],operations:[]};
+            var lineIndex = 0;
+            // looking for Class Definition Line
+            console.log("lastLine="+editor.doc.lastLine());
+            for (; lineIndex <= editor.doc.lastLine(); lineIndex++) {
+                var classNameToken = Mapping.getTokenOfTypeAtLine(Types.ClassName, lineIndex);
+                if (classNameToken) {
+                    classSpecification.name = extractName(classNameToken.string);
+                    Mapping.ToPapyrus.propertiesAndOperationsToPapyrus(lineIndex + 1, classSpecification);
+                    console.log(JSON.stringify(classSpecification+""));
+                }
+                return JSON.stringify(classSpecification);
+            }
+        },
+
+        // look for properties and operations in the text
+
+        propertiesAndOperationsToPapyrus : function (lineIndex, classSpecification) {
+            for (; lineIndex <= editor.doc.lastLine(); lineIndex++) {
+                if (Mapping.ToPapyrus.isLineAProperty(lineIndex)) {
+                    var property=Mapping.ToPapyrus.extractPropertyFromLine(lineIndex);
+                    classSpecification.properties.push(property);
+                }
+                else if (Mapping.ToPapyrus.isLineAnOperation(lineIndex)) {
+                    var operation=Mapping.ToPapyrus.extractOperationFromLine(lineIndex);
+                    classSpecification.operations.push(operation);
+                }
+            }
+        },
+
+        // Test if the line defines a property
+
+        isLineAProperty : function (lineIndex) {
+            var propertyName = Mapping.getTokenOfTypeAtLine(Types.PropertyName, lineIndex);
+            var paramListStarted = Mapping.getTokenOfTypeAtLine(Types.ParamList_Started, lineIndex);
+            return (propertyName!=null && paramListStarted==null);
+        },
+
+        // Test if the line defines an operation
+
+        isLineAnOperation : function (lineIndex) {
+            var operationName = Mapping.getTokenOfTypeAtLine(Types.PropertyName, lineIndex);
+            var paramListStarted = Mapping.getTokenOfTypeAtLine(Types.ParamList_Started, lineIndex);
+            return (operationName!=null && paramListStarted!=null);
+        },
+
+        // ==================
+        // PROPERTY CASE
+        // ==================
+
+        // Extract a property of the line
+
+        extractPropertyFromLine : function (lineIndex) {
+            var visibilityKind = {
+                "+" : "public",
+                "-" : "private",
+                "#" : "package",
+                "~" : "protected"
+            };
+            function valueForTokenType (type) {
+                var token=Mapping.getTokenOfTypeAtLine(type, lineIndex);
+                if (token!=null)
+                    return token.string;
+                return undefined;
+            }
+            var property = defaultTemplateForProperty();
+            var value;
+
+            value=valueForTokenType(Types.Visibility);
+            property.visibility = ( value!=null ? visibilityKind[value] : "public" );
+
+            value=valueForTokenType(Types.Derived);
+            property.derived = ( value!=null ? true : false );
+
+            value=valueForTokenType(Types.PropertyName);
+            property.name = extractName(value);
+
+            value=valueForTokenType(Types.TypeName);
+            property.type = ( value!=null ? extractName(value) : "String" );
+
+            setMultiplicityFromText(property,valueForTokenType(Types.Multiplicity))
+
+            Mapping.ToPapyrus.extractModifierListFromLine(lineIndex,property);
+            return property;
+        },
+
+        // Extract the list of modifier (property) of the line
+
+        extractModifierListFromLine : function (lineIndex,property) {
+            var tokens = editor.getLineTokens(lineIndex);
+            var i=0;
+            for (; i < tokens.length && tokens[i].type!=Types.ModifierList_Started; i++) {
+            }
+            i++;
+            for (; i < tokens.length && tokens[i].type!=Types.ModifierListEnd; i++) {
+                var token=tokens[i];
+                if (token.type==Types.Modifier) {
+                    var modifier=token.string;
+                    switch (modifier) {
+                        case "readOnly" :
+                            property.readOnly=true;
+                            break;
+                        case "union" :
+                            property.derivedUnion=true;
+                            break;
+                        case "ordered" :
+                            property.ordered=true;
+                            break;
+                        case "unordered" :
+                            property.ordered=false;
+                            break;
+                        case "unique" :
+                            property.unique=true;
+                            break;
+                        case "nonunique" :
+                            property.unique=false;
+                            break;
+                        case "seq" :
+                        case "sequence" :
+                            property.sequence=true;
+                            break;
+                        case "id" :
+                            property.id=true;
+                            break;
+                    }
+
+                }
+            }
+
+        },
+
+        // ==================
+        // OPERATION CASE
+        // ==================
+
+        // Extract an operation of the line
+
+        extractOperationFromLine : function (lineIndex) {
+            var visibilityKind = {
+                "+" : "public",
+                "-" : "private",
+                "#" : "package",
+                "~" : "protected"
+            };
+            function valueForTokenType (type) {
+                var token=Mapping.getTokenOfTypeAtLine(type, lineIndex);
+                if (token!=null)
+                    return token.string;
+                return undefined;
+            }
+            var operation=defaultTemplateForOperation();
+            operation.parameters={};
+            var value;
+
+            value=valueForTokenType(Types.Visibility);
+            operation.visibility = ( value!=null ? visibilityKind[value] : "public" );
+
+            value=valueForTokenType(Types.PropertyName);
+            operation.name = extractName(value);
+
+            var parameterList = Mapping.ToPapyrus.extractParameterListFromLine(lineIndex);
+
+            // Return parameter
+
+            value=valueForTokenType(Types.ReturnTypeName_JustGiven);
+            if (value!=null) {
+                var returnParameter={};
+                returnParameter.name="";
+                returnParameter.type=( value!=null ? extractName(value) : "String" );
+                returnParameter.direction="return";
+                returnParameter.unique=true;
+                value=valueForTokenType(Types.ReturnTypeMultiplicity);
+                setMultiplicityFromText(returnParameter,valueForTokenType(Types.ReturnTypeMultiplicity));
+                Mapping.ToPapyrus.extractOperationPropertyListFromLine(lineIndex,returnParameter);
+                parameterList.push(returnParameter);
+            }
+            operation.parameters=parameterList;
+            return operation;
+        },
+
+        // Extract the list of parameter (operation) of the line
+
+        extractParameterListFromLine : function (lineIndex) {
+            var parameterList = [];
+            var tokens = editor.getLineTokens(lineIndex);
+            var i=0;
+            for (; i < tokens.length && tokens[i].type!=Types.ParamList_Started; i++) {
+            }
+            i++;
+            var parameter=defaultTemplateForOperationParameter();
+            var startingTokenIndex=i;
+            for (; i < tokens.length && tokens[i].type!=Types.ParamListEnd; i++) {
+                var token=tokens[i];
+                if (token.type==Types.ParamDirection_JustGiven) {
+                    parameter.direction=token.string;
+                } else if (token.type==Types.ParamName_JustGiven) {
+                    parameter.name=extractName(token.string);
+                } else if (token.type==Types.ParamType_JustGiven) {
+                    parameter.type=extractName(token.string);
+                } else if (token.type==Types.ParamMultiplicity_JustGiven) {
+                    setMultiplicityFromText(parameter,token.string);
+                } else if (token.type==Types.ParamListEnd || token.type==Types.ParamListSeparator ) {
+                    if (parameter.name) {
+                        parameterList.push(parameter);
+                        Mapping.ToPapyrus.extractParameterPropertyListFromLine(lineIndex, startingTokenIndex, parameter);
+                    }
+                    parameter=defaultTemplateForOperationParameter();
+                    startingTokenIndex=i+1;
+                }
+            }
+            if (parameter.name) {
+                parameterList.push(parameter);
+                Mapping.ToPapyrus.extractParameterPropertyListFromLine(lineIndex, startingTokenIndex, parameter);
+            }
+            return parameterList;
+        },
+
+        // Extract the list of properties for parameter (operation)
+
+        extractParameterPropertyListFromLine : function (lineIndex, startingTokenIndex, parameter) {
+
+            var tokens = editor.getLineTokens(lineIndex);
+            var i=startingTokenIndex;
+
+            for (; i < tokens.length &&
+                            tokens[i].type!=Types.ParamPropertyList_Started &&
+                            tokens[i].type!=Types.ParamListSeparator &&
+                            tokens[i].type!=Types.ParamListEnd
+                    ; i++) {
+            }
+            if (i == tokens.length || tokens[i].type!=Types.ParamPropertyList_Started)
+                return;
+
+            i++;
+
+            for (; i < tokens.length && tokens[i].type!=Types.ParamPropertyListEnd; i++) {
+                var token=tokens[i];
+                if (token.type==Types.ParamProperty_JustGiven) {
+                    var paramProperty=token.string;
+                    switch (paramProperty) {
+                        case "ordered" :
+                            parameter.ordered=true;
+                            break;
+                        case "unordered" :
+                            parameter.ordered=false;
+                            break;
+                        case "unique" :
+                            parameter.unique=true;
+                            break;
+                        case "nonunique" :
+                            parameter.unique=false;
+                            break;
+                        case "seq" :
+                        case "sequence" :
+                            parameter.sequence=true;
+                            break;
+                    }
+
+                }
+            }
+
+        },
+
+        // Extract the list of properties of an operation
+
+        extractOperationPropertyListFromLine : function (lineIndex, returnParameter) {
+
+            var tokens = editor.getLineTokens(lineIndex);
+            var i=0;
+
+            for (; i < tokens.length &&
+                   tokens[i].type!=Types.OperationPropertyList_Started
+                ; i++) {
+            }
+
+            if (i == tokens.length || tokens[i].type!=Types.OperationPropertyList_Started)
+                return;
+
+            i++;
+
+            for (; i < tokens.length && tokens[i].type!=Types.OperationPropertyListEnd; i++) {
+                var token=tokens[i];
+                if (token.type==Types.OperationProperty_JustGiven) {
+                    var operationProperty=token.string;
+                    switch (operationProperty) {
+                        case "ordered" :
+                            returnParameter.ordered=true;
+                            break;
+                        case "unordered" :
+                            returnParameter.ordered=false;
+                            break;
+                        case "unique" :
+                            returnParameter.unique=true;
+                            break;
+                        case "nonunique" :
+                            returnParameter.unique=false;
+                            break;
+                        case "seq" :
+                        case "sequence" :
+                            returnParameter.sequence=true;
+                            break;
+                    }
+
+                }
+            }
+
+        }
+
+    }
+
+}
+
+
+Properties = {
+    currentProperty: {},
+    list: [],
+    addCurrentProperty: function () {
+        Properties.list.push(Properties.currentProperty);
+        Properties.currentProperty = {};
+    },
+    cleanList: function () {
+        Properties.list = [];
+    }
+}
+
+function getLastState() {
+    var lines = editor.getValue().split("\n");
+    var lastLineNumber = lines.length - 1;
+    var lastColumnNumber = lines[lastLineNumber].length - 1;
+    return editor.getTokenAt({line: lastLineNumber, ch: lastColumnNumber}).state;
+}
+
+function getLineTokens(lineNumber) {
+
+    function createToken(codeMirrorToken) {
+        return {
+            type: codeMirrorToken.type,
+            position: codeMirrorToken.state.position,
+            start: codeMirrorToken.start,
+            end: codeMirrorToken.end,
+            string: codeMirrorToken.string
+        };
+    }
+
+    var originalLineTokens = editor.getLineTokens(lineNumber);
+
+    if (originalLineTokens.length == 0)
+        return originalLineTokens;
+
+    var finalLineTokens = [];
+
+    var currentToken = createToken(originalLineTokens[0]);
+    finalLineTokens.push(currentToken);
+
+    for (var i = 1; i < originalLineTokens.length; i++) {
+        var currentCodeMirrorToken = originalLineTokens[i];
+        if (currentCodeMirrorToken.state.position == currentToken.position &&
+            currentCodeMirrorToken.type == currentToken.type) {
+            currentToken.end = currentCodeMirrorToken.end;
+            currentToken.string += currentCodeMirrorToken.string;
+        }
+        else {
+            currentToken = createToken(originalLineTokens[i]);
+            finalLineTokens.push(currentToken);
+        }
+    }
+    return finalLineTokens;
+}
+
+function lookForTokenWithType(tokens, type) {
+    for (var i = 0; i < tokens.length; i++) {
+        if (tokens[i].type == type)
+            return tokens[i];
+    }
+    return null;
+}
+
+
+function isAttributeOnLine(lineNumber) {
+    var tokens = getLineTokens(lineNumber);
+    var property = {};
+
+    function setValueForTokenWithType(type, propertyName) {
+        var token = lookForTokenWithType(tokens, type);
+        if (token)
+            property[propertyName] = token.string;
+    }
+
+    setValueForTokenWithType(Types.Visibility, "visibility");
+    setValueForTokenWithType(Types.Derived, "derived");
+    setValueForTokenWithType(Types.PropertyName, "name");
+    setValueForTokenWithType(Types.TypeName, "type");
+    if (property.name)
+        return property;
+    return null;
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/readingTokens.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/readingTokens.js
new file mode 100644
index 0000000..63d07ef
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/readingTokens.js
@@ -0,0 +1,205 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+function readAndOrConsume (stream, regexp) {
+    var result=stream.match(regexp,false);
+    if (result)
+        result=stream.match(regexp,true);
+    return result;
+}
+
+//
+// TOKENS FOR CLASS DEFINITION
+//
+
+function readClassDefStart (stream) {
+    return readAndOrConsume(stream,/^class/);
+}
+
+function readClassName (stream) {
+    var nameWithoutInvertedCommas=readAndOrConsume(stream,/^[A-Za-z]([A-Za-z0-9])*/);
+    if (nameWithoutInvertedCommas)
+        return nameWithoutInvertedCommas;
+    var nameWithInvertedCommas= readAndOrConsume(stream,/^"[A-Za-z]([A-Za-z0-9 ])*"/);
+    return nameWithInvertedCommas;
+}
+
+//
+// TOKENS FOR PROPERTY DEFINITION
+//
+
+function readVisibility (stream) {
+    return readAndOrConsume(stream,/^(\+|-|#|~)/);
+}
+function readDerived (stream) {
+    return readAndOrConsume(stream,/^\//);
+}
+
+function readPropertyName (stream) {
+    return readClassName(stream);
+}
+
+//
+// TOKENS FOR ATTRIBUTE DEFINITION
+//
+
+function readAttributeTypeDefStart (stream) {
+    return readAndOrConsume(stream,/^:/);
+}
+
+function readAttributeTypeName (stream) {
+    var typeNameWithoutInvertedCommas=readAndOrConsume(stream,/^[A-Za-z]([A-Za-z0-9])*(::[A-Za-z]([A-Za-z0-9])*)*/);
+    if (typeNameWithoutInvertedCommas)
+        return typeNameWithoutInvertedCommas;
+    var typeNameWithInvertedCommas= readAndOrConsume(stream,/^""[A-Za-z]([A-Za-z0-9])*(::[A-Za-z]([A-Za-z0-9])*)*"/);
+    return typeNameWithInvertedCommas;
+}
+
+function readAttributeMultiplicity (stream) {
+    return readAndOrConsume(stream,/^\[(\d)+\.\.(\d+|n|\*)\]/);
+}
+
+function readAttributeModifierListStart (stream) {
+    return readAndOrConsume(stream,/^{/);
+}
+
+function readAttributeModifierListSeparator (stream) {
+    return readAndOrConsume(stream,/^,/);
+}
+
+function readAttributeModifierListEnd (stream) {
+    return readAndOrConsume(stream,/^}/);
+}
+
+function readAttributeModifier (stream) {
+
+    var basicModifier=readAndOrConsume(stream,/^(readOnly|union|ordered|unordered|unique|nonunique|seq|sequence|id)/);
+    if (basicModifier)
+        return basicModifier;
+
+    var modifierPointingPropertyWithoutInvertedCommas= readAndOrConsume(stream,/^(redefines|subsets)( )+[A-Za-z]([A-Za-z0-9])*/);
+    if (modifierPointingPropertyWithoutInvertedCommas)
+        return modifierPointingPropertyWithoutInvertedCommas;
+
+    var modifierPointingPropertyWithInvertedCommas= readAndOrConsume(stream,/^(redefines|subsets)( )*"[A-Za-z]([A-Za-z0-9])*"/);
+    return modifierPointingPropertyWithInvertedCommas;
+}
+
+//
+// TOKENS FOR OPERATION DEFINITION
+//
+
+function readParameterListStart (stream) {
+    return readAndOrConsume(stream,/^\(/);
+}
+
+function readParameterListSeparator (stream) {
+    return readAndOrConsume(stream,/^,/);
+}
+
+function readParameterListEnd (stream) {
+    return readAndOrConsume(stream,/^\)/);
+}
+
+//
+// TOKENS FOR PARAMETER DEFINITION
+//
+
+function readParameterDirection (stream) {
+    return readAndOrConsume(stream,/^(in|out|inout)/);
+}
+
+function readParameterName (stream) {
+    return readClassName (stream);
+}
+
+function readParameterTypeDefStart (stream) {
+    return readAndOrConsume(stream,/^:/);
+}
+
+function readParameterTypeName (stream) {
+    return readAttributeTypeName(stream);
+}
+
+function readParameterMultiplicity (stream) {
+    return readAttributeMultiplicity(stream);
+}
+
+//
+// sub-case of Parameter Property list
+//
+
+function readParameterPropertyListStart (stream) {
+    return readAndOrConsume(stream,/^{/);
+}
+
+function readParameterPropertyListSeparator (stream) {
+    return readAndOrConsume(stream,/^,/);
+}
+
+function readParameterPropertyListEnd (stream) {
+    return readAndOrConsume(stream,/^}/);
+}
+
+function readParameterProperty (stream) {
+    return readAndOrConsume(stream,/^(ordered|unordered|unique|nonunique|seq|sequence)/);
+}
+
+//
+// TOKENS FOR OPERATION RETURN TYPE
+//
+
+function readReturnTypeDefStart (stream) {
+    return readAndOrConsume(stream,/^:/);
+}
+
+function readReturnTypeName (stream) {
+    return readAttributeTypeName(stream);
+}
+
+function readReturnTypeMultiplicity (stream) {
+    return readAttributeMultiplicity(stream);
+}
+
+//
+// sub-case of Operation Property list
+//
+
+function readOperationPropertyListStart (stream) {
+    return readAndOrConsume(stream,/^{/);
+}
+
+function readOperationPropertyListSeparator (stream) {
+    return readAndOrConsume(stream,/^,/);
+}
+
+function readOperationPropertyListEnd (stream) {
+    return readAndOrConsume(stream,/^}/);
+}
+
+function readOperationProperty (stream) {
+
+    var basicModifier=readAndOrConsume(stream,/^(query|ordered|unordered|unique|nonunique|seq|sequence)/);
+    if (basicModifier)
+        return basicModifier;
+
+    var modifierPointingPropertyWithoutInvertedCommas= readAndOrConsume(stream,/^redefines( )+[A-Za-z]([A-Za-z0-9])*/);
+    if (modifierPointingPropertyWithoutInvertedCommas)
+        return modifierPointingPropertyWithoutInvertedCommas;
+
+    var modifierPointingPropertyWithInvertedCommas= readAndOrConsume(stream,/^redefines( )*"[A-Za-z]([A-Za-z0-9])*"/);
+    return modifierPointingPropertyWithInvertedCommas;
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/statesTypesAndLabels.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/statesTypesAndLabels.js
new file mode 100644
index 0000000..c0e54d6
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/statesTypesAndLabels.js
@@ -0,0 +1,160 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+States = {
+
+    StartOfDocument : 1,
+
+    // CLASS DEFINITION
+
+    ClassDefStart : 100,
+    ClassName: 101,
+
+    // PROPERTY DEFINITION
+
+
+    Beginning :200,
+    Visibility_JustGiven : 201,
+    Derived_JustGiven : 202,
+    Name_JustGiven : 204,
+ 
+    // ATTRIBUTE DEFINITION
+
+    TypeDef_Started : 300,
+    TypeName_JustGiven : 301,
+    Multiplicity_JustGiven : 302,
+    ModifierListStart : 303,
+    ModifierListSeparator : 304,
+    ModifierListEnd : 305,
+    Modifier : 306,
+
+    // OPERATION / PARAMETER DEFINITION
+
+    ParamList_Started : 400,
+    ParamDirection_JustGiven : 401,
+    ParamName_JustGiven : 402,
+    ParamTypeDefStart : 403,
+    ParamType_JustGiven : 404,
+    ParamMultiplicity_JustGiven : 405,
+
+        // param property
+
+        ParamPropertyList_Started : 406,
+        ParamProperty_JustGiven : 407,
+        ParamPropertyListSeparator : 408,
+        ParamPropertyListEnd : 409,
+
+    ParamListSeparator : 410,
+    ParamListEnd : 411,
+
+        // return type
+
+        ReturnTypeDef_Started : 412,
+        ReturnTypeName_JustGiven : 413,
+        ReturnTypeMultiplicity : 414,
+
+    OperationPropertyList_Started : 415,
+    OperationProperty_JustGiven : 416,
+    OperationPropertyListSeparator : 417,
+    OperationPropertyListEnd : 418,
+
+    Error : 1000
+};
+
+Types = {
+
+    // CLASS
+
+    ClassDefStart : "classDefStart",
+    ClassName: "className",
+
+
+    // PROPERTY OR OPERATION
+
+    Visibility : "visibility",
+    PropertyName : "name",
+    Multiplicity : "multiplicity",
+
+    // PROPERTY
+
+    Derived : "derived",
+    TypeDefStart : "typeDefStart",
+    TypeName : "type",
+    ModifierList_Started : "modifierListStart",
+    Modifier : "modifier",
+    ModifierListSeparator : "modifierListSeparator",
+    ModifierListEnd : "modifierListEnd",
+
+    // OPERATION
+
+    ParamList_Started : "paramListStart",
+    ParamListSeparator : "paramListSeparator",
+    ParamListEnd : "paramListEnd",
+
+    ParamDirection_JustGiven : "paramDirection",
+    ParamName_JustGiven : "paramName",
+    ParamTypeDefStart : "paramTypeDefStart",
+    ParamType_JustGiven : "paramType",
+    ParamMultiplicity_JustGiven : "paramMultiplicity",
+
+    // param property
+
+    ParamPropertyList_Started : "paramPropertyListStart",
+    ParamProperty_JustGiven : "paramProperty",
+    ParamPropertyListSeparator : "paramPropertyListSeparator",
+    ParamPropertyListEnd : "paramPropertyListEnd",
+
+
+
+    // return type
+
+    ReturnTypeDef_Started : "returnTypeDefStart",
+    ReturnTypeName_JustGiven : "returnType",
+    ReturnTypeMultiplicity : "returnTypeMultiplicity",
+
+    OperationPropertyList_Started : "operationPropertyListStart",
+    OperationProperty_JustGiven : "operationProperty",
+    OperationPropertyListSeparator : "operationPropertyListSeparator",
+    OperationPropertyListEnd : "operationPropertyListEnd",
+
+    Error : "error"
+}
+
+StateLabels = newObjectWithProperties(
+    States.StartOfDocument , "StartOfDocument",
+
+    States.ClassDefStart, "ClassDefStart",
+    States.ClassName, "ClassName",
+
+    States.Beginning, "Beginning",
+    States.Visibility_JustGiven, "Visibility_JustGiven",
+    States.Derived_JustGiven, "Derived_JustGiven",
+    States.CaracForName, "CaracForName",
+    States.Name_JustGiven, "Name_JustGiven",
+    States.TypeDef_Started, "TypeDef_Started",
+    States.CaracForTypeName, "CaracForTypeName",
+    States.TypeName_JustGiven, "TypeName_JustGiven",
+    States.Multiplicity_JustGiven, "Multiplicity_JustGiven",
+    States.ModifierListStart, "ModifierListStart",
+    States.ModifierListSeparator, "ModifierListSeparator",
+    States.ModifierListEnd, "ModifierListEnd",
+    States.Modifier, "Modifier",
+
+    States.Error, "Error"
+);
+
+
+
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/utils.js b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/utils.js
new file mode 100644
index 0000000..f0a9fe7
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/scripts/utils.js
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+function addProperties (object) {
+    for (var i=1;i<arguments.length;i+=2) {
+        object[arguments[i]]=arguments[i+1];
+    }
+}
+
+function newObjectWithProperties () {
+    var newObject={};
+    for (var i=0;i<arguments.length;i+=2) {
+        newObject[arguments[i]]=arguments[i+1];
+    }
+    return newObject;
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/styles/uml.css b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/styles/uml.css
new file mode 100644
index 0000000..364fedd
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/html/umlClassEditor/styles/uml.css
@@ -0,0 +1,40 @@
+
+.cm-s-default .cm-visibility {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-derived {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-name {color: #0d00b3;}
+.cm-s-default .cm-typeDefStart {color: #000;}
+.cm-s-default .cm-type {color: #000;}
+.cm-s-default .cm-multiplicity {color: #000;}
+
+.cm-s-default .cm-modifierListStart {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-modifierListSeparator {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-modifierListEnd {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-modifier {color: #6b0043;font-weight: bold;}
+
+.cm-s-default .cm-classDefStart {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-className {color: #000;font-size: 120%}
+
+.cm-s-default .cm-paramPropertyListStart {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-paramPropertyListSeparator {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-paramPropertyListEnd {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-paramProperty {color: #6b0043;font-weight: bold;}
+
+.cm-s-default .cm-paramListStart {color: #000;}
+.cm-s-default .cm-paramListSeparator {color: #000;}
+.cm-s-default .cm-paramListEnd {color: #000;}
+
+.cm-s-default .cm-paramDirection {color: #000;}
+.cm-s-default .cm-paramName {color: #000;}
+.cm-s-default .cm-paramTypeDefStart {color: #000;}
+.cm-s-default .cm-paramType {color: #000;}
+.cm-s-default .cm-paramMultiplicity {color: #000;}
+
+.cm-s-default .cm-returnTypeDefStart {color: #000;}
+.cm-s-default .cm-returnType {color: #000;}
+.cm-s-default .cm-returnTypeMultiplicity {color: #000;}
+
+.cm-s-default .cm-operationPropertyListStart {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-operationPropertyListSeparator {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-operationPropertyListEnd {color: #6b0043;font-weight: bold;}
+.cm-s-default .cm-operationProperty {color: #6b0043;font-weight: bold;}
+
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/plugin.xml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/plugin.xml
new file mode 100644
index 0000000..08ab7be
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/plugin.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         id="textual-edition"
+         point="org.eclipse.ui.commands">
+      <category
+            description="TextualEdition of Uml Elements"
+            id="org.eclipse.papyrus.uml.diagram.clazz.lf.TextualEditionID"
+            name="Textual Edition">
+      </category>
+      <command
+            categoryId="org.eclipse.papyrus.uml.diagram.clazz.lf.TextualEditionID"
+            defaultHandler="org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.handlers.ClassEditionHandler"
+            description="Launch the small textual class editor"
+            id="org.eclipse.papyrus.uml.diagram.clazz.lf.ClassEdition"
+            name="Class Textual Edition">
+      </command>
+   </extension>
+   <extension
+         id="context-menus"
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.clazz.lf.ClassEdition">
+            <visibleWhen
+                  checkEnabled="false">
+               <with
+                     variable="activeMenuSelection">
+                  <iterate
+                        ifEmpty="false">
+                     <or>
+                        <instanceof
+                              value="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart">
+                        </instanceof>
+                     </or>
+                  </iterate>
+               </with>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.bindings">
+      <key
+            commandId="org.eclipse.papyrus.uml.diagram.clazz.lf.ClassEdition"
+            contextId="org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="SHIFT+ENTER">
+      </key>
+   </extension>
+
+</plugin>
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/pom.xml b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/pom.xml
new file mode 100755
index 0000000..20efef7
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.uml.diagram.clazz-lf</artifactId>
+	    <version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/Activator.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/Activator.java
new file mode 100644
index 0000000..91b713b
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/Activator.java
@@ -0,0 +1,141 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.messages.Messages;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	private LogHelper myLogHelper;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Logs an error through a message (param)
+	 *
+	 * @param error
+	 */
+	public void logError(String error) {
+		getLogHelper().warn(error);
+	}
+
+	/**
+	 * Logs an error through a message and an exception (params)
+	 *
+	 * @param error
+	 * @param throwable
+	 */
+	public void logError(String error, Throwable throwable) {
+		getLogHelper().error(error, throwable);
+	}
+
+	/**
+	 * Logs an information through a message (param)
+	 *
+	 * @param message
+	 */
+	public void logInfo(String message) {
+		getLogHelper().info(message);
+	}
+
+	/**
+	 * Logs an information through a message and an exception (params)
+	 *
+	 * @param message
+	 * @param throwable
+	 */
+	public void logInfo(String message, Throwable throwable) {
+		getLogHelper().error(message, throwable);
+	}
+
+	/**
+	 * Gets the LogHelper
+	 *
+	 * @return
+	 */
+	public LogHelper getLogHelper() {
+		if (myLogHelper == null) {
+			myLogHelper = new LogHelper(getDefault());
+		}
+		return myLogHelper;
+	}
+
+	public void logNullParameter(String parameterName) {
+		getLogHelper().warn(Messages.Activator_Parameter + parameterName + Messages.Activator_IsNullInMethod + getMethodName(4));
+	}
+
+	public void logNullParameter(String parameterName, int deep) {
+		getLogHelper().warn(Messages.Activator_Parameter + parameterName + Messages.Activator_IsNullInMethod + getMethodName(deep));
+	}
+
+	public void logCastProblem(String variableName, Class<?> targetCastClass, int deep) {
+		getLogHelper().warn(variableName + Messages.Activator_CannotBeCastedIn + targetCastClass.getName() + Messages.Activator_InMethod + getMethodName(deep));
+	}
+
+	public void logCastProblem(String variableName, Class<?> targetCastClass) {
+		getLogHelper().warn(variableName + Messages.Activator_CannotBeCastedIn + targetCastClass.getName() + Messages.Activator_InMethod + getMethodName(3));
+	}
+
+	/**
+	 * Get the method name for a depth in call stack. <br />
+	 * Utility function
+	 *
+	 * @param depth
+	 *            depth in the call stack (0 means current method, 1 means call method, ...)
+	 * @return method name
+	 */
+	public static String getMethodName(int deep) {
+		final StackTraceElement[] ste = Thread.currentThread().getStackTrace();
+		return ste[deep].getMethodName() + " (" + ste[deep].getClassName() + ")";
+	}
+
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/ClassExpander.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/ClassExpander.java
new file mode 100644
index 0000000..02e00d8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/ClassExpander.java
@@ -0,0 +1,230 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.classcompartments;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlClass;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+/**
+ * This class is dedicated to expand if necessary the properties and operations
+ * compartments: if the textual definition of the class includes properties and
+ * the properties compartment is not visible and the same for operations. <BR>
+ * This is why one of constructor includes an instance of UmlClass (textual
+ * definition of the class).
+ */
+public class ClassExpander {
+
+	private ClassEditPart classEditPart;
+	private JsonUmlClass theClass;
+	private final static Activator LOGGER = Activator.getDefault();
+
+	/**
+	 * This constructor only uses one parameter (class edit part). That means that
+	 * there is no textual definition of the class to consider.
+	 *
+	 * @param classEditPart
+	 *            the class to "expand".
+	 */
+	public ClassExpander(ClassEditPart classEditPart) {
+		this(classEditPart, null);
+	}
+
+	/**
+	 * This constructor uses two parameters: a class edit part and the textual
+	 * definition of the class. That means that there is a textual definition of the
+	 * class to consider.
+	 *
+	 * @param classEditPart
+	 *            the class to "expand".
+	 * @param theClass
+	 *            the textual definition of the class
+	 */
+	public ClassExpander(ClassEditPart classEditPart, JsonUmlClass theClass) {
+		super();
+		this.classEditPart = classEditPart;
+		this.theClass = theClass;
+	}
+
+	//
+	// different facilities functions
+	//
+
+	/**
+	 * The main public method: called to display the properties and operations
+	 * compartments if necessary (i.e. if the textual definition induces a change).
+	 * It is just a redirection/proxy to
+	 * {@link ClassExpander#setCompartmentsVisible()}.
+	 */
+	public void expandIfNecessary() {
+		setCompartmentsVisible();
+	}
+
+	/**
+	 * This private method does the main work: get all the compartments and check
+	 * whether they have to be visible/displayed or not.
+	 */
+	private void setCompartmentsVisible() {
+		List<BasicCompartment> compartmentList = getClassCompartments();
+
+		if (!compartmentList.isEmpty()) {
+			try {
+				TransactionalEditingDomain editingDomain = ServiceUtilsForEditPart.getInstance()
+						.getTransactionalEditingDomain(classEditPart);
+				executeWithoutCommandStack(editingDomain, new AbstractCommand() {
+
+					@Override
+					public void execute() {
+						for (BasicCompartment compartment : compartmentList) {
+							if (isNonEmptyPropertyOrOperationCompartment(compartment) && !compartment.isVisible()) {
+								compartment.setVisible(true);
+								addALittleHeightForACompartment();
+							}
+
+						}
+
+					}
+
+					@Override
+					public void redo() {
+						// #TODO expand to undo
+					}
+
+				});
+			} catch (ServiceException exception) {
+				Activator.getDefault().logError(exception.toString(), exception);
+			}
+		}
+	}
+
+	/**
+	 * This method checks
+	 * <UL>
+	 * <LI>if the compartment is the properties or operation one</LI>
+	 * <LI>if the corresponding textual definition has been given and if it is,
+	 * there is elements for this compartment.</LI>
+	 * </UL>
+	 *
+	 * @param compartment
+	 *            the compartment to consider
+	 * @return true if properties/operations, with textual definition defining
+	 *         something for it.
+	 */
+	protected boolean isNonEmptyPropertyOrOperationCompartment(BasicCompartment compartment) {
+		return ((compartment.getType().equals(ClassAttributeCompartmentEditPart.VISUAL_ID)
+				&& (theClass == null || !theClass.getProperties().isEmpty()))
+				|| (compartment.getType().equals(ClassAttributeCompartmentEditPartCN.VISUAL_ID)
+						&& (theClass == null || !theClass.getProperties().isEmpty()))
+				|| (compartment.getType().equals(ClassOperationCompartmentEditPart.VISUAL_ID)
+						&& (theClass == null || !theClass.getOperations().isEmpty()))
+				|| (compartment.getType().equals(ClassOperationCompartmentEditPartCN.VISUAL_ID)
+						&& (theClass == null || !theClass.getOperations().isEmpty())));
+	}
+
+	/**
+	 * This method returns the properties and operations compartments (notation
+	 * level) that we can potentially expand.
+	 *
+	 * @return the properties and operations compartments
+	 */
+	private List<BasicCompartment> getClassCompartments() {
+		List<BasicCompartment> compartmentList = new ArrayList<>();
+		if (classEditPart.getModel() instanceof Shape) {
+			Shape classModel = Shape.class.cast(classEditPart.getModel());
+			for (Object child : classModel.getChildren()) {
+				if (isACompartmentToExpandCollapse(child)) {
+					compartmentList.add(BasicCompartment.class.cast(child));
+				}
+			}
+		} else {
+			LOGGER.logCastProblem("classEditPart.getModel()", Shape.class); //$NON-NLS-1$
+		}
+		return compartmentList;
+	}
+
+	/**
+	 * This method adds a little height to the class when displaying a compartment
+	 * (this one is normally empty).
+	 */
+	protected void addALittleHeightForACompartment() {
+		if (classEditPart.getModel() instanceof Shape) {
+			Shape classModel = Shape.class.cast(classEditPart.getModel());
+			LayoutConstraint layoutConstraint = classModel.getLayoutConstraint();
+			int currentHeight = java.lang.Integer.class.cast(layoutConstraint.eGet(NotationPackage.eINSTANCE.getSize_Height()));
+			UmlClassResizer.getInstance().realResizeHeight(classModel.getLayoutConstraint(), currentHeight + 20);
+		} else {
+			LOGGER.logCastProblem("classEditPart.getModel()", Shape.class); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * This methods checks if the compartment is properties or operations ones.
+	 *
+	 * @param child
+	 *            compartment to check.
+	 * @return true if one of previously listed.
+	 */
+	private boolean isACompartmentToExpandCollapse(Object child) {
+		if (child instanceof BasicCompartment) {
+			BasicCompartment compartment = BasicCompartment.class.cast(child);
+			if (compartment.getType().equals(ClassAttributeCompartmentEditPart.VISUAL_ID)
+					|| compartment.getType().equals(ClassOperationCompartmentEditPart.VISUAL_ID)
+					|| compartment.getType().equals(ClassAttributeCompartmentEditPartCN.VISUAL_ID)
+					|| compartment.getType().equals(ClassOperationCompartmentEditPartCN.VISUAL_ID)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * This method allows to execute a command without changing the command stack.
+	 * This allows to avoid seeing the command in the Undo/Redo menu.
+	 *
+	 * @param editingDomain
+	 *            This parameter is always needed to perform a command
+	 * @param command
+	 *            The command to perform
+	 */
+	private void executeWithoutCommandStack(TransactionalEditingDomain editingDomain, Command command) {
+		try {
+			GMFUnsafe.write(editingDomain, command);
+		} catch (InterruptedException exception) {
+			Activator.getDefault().logError(exception.toString(), exception);
+		} catch (RollbackException exception) {
+			Activator.getDefault().logError(exception.toString(), exception);
+		}
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/ExpanderFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/ExpanderFactory.java
new file mode 100644
index 0000000..4ec3c49
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/ExpanderFactory.java
@@ -0,0 +1,84 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.classcompartments;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlClass;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+public class ExpanderFactory {
+
+	private static ExpanderFactory instance;
+	private static final Activator LOGGER = Activator.getDefault();
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 *
+	 * @return instance/factory
+	 */
+	public static ExpanderFactory getInstance() {
+		if (instance == null) {
+			instance = new ExpanderFactory();
+		}
+		return instance;
+	}
+
+	private ExpanderFactory() {
+
+	}
+
+	/**
+	 * The class Expanding needs 2 parameters to create an instance, see
+	 * {@link ExpanderFactory#createExpanding(ClassEditPart, JsonUmlClass)}. Here the value of
+	 * the UmlClass (textual definition of the class) is null, so to not consider
+	 *
+	 * @param classEditPart
+	 *            class(EditPart) to expand
+	 * @return the instance of Expanding set with the previous parameters
+	 */
+	public ClassExpander createExpanding(ClassEditPart classEditPart) {
+		if (classEditPart == null) {
+			LOGGER.logNullParameter("classEditPart"); //$NON-NLS-1$
+			return null;
+		} else {
+			return new ClassExpander(classEditPart);
+		}
+	}
+
+	/**
+	 * This method creates an instance of Expanding and uses two parameters: a class
+	 * edit part and the textual definition of the class. That means that there is a
+	 * textual definition of the class to consider.
+	 *
+	 * @param classEditPart
+	 *            the class to "expand".
+	 * @param theClass
+	 *            the textual definition of the class
+	 * @return the instance of Expanding set with the previous parameters
+	 */
+	public ClassExpander createExpanding(ClassEditPart classEditPart, JsonUmlClass theClass) {
+		if (classEditPart == null) {
+			LOGGER.logNullParameter("classEditPart"); //$NON-NLS-1$
+			return null;
+		} else if (theClass == null) {
+			LOGGER.logNullParameter("theClass"); //$NON-NLS-1$
+			return null;
+		} else {
+			return new ClassExpander(classEditPart, theClass);
+		}
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/UmlClassResizer.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/UmlClassResizer.java
new file mode 100644
index 0000000..17d03e3
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/classcompartments/UmlClassResizer.java
@@ -0,0 +1,158 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.classcompartments;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.messages.Messages;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+/**
+ * The class UmlClassResizer allows to propose a static-like method
+ * "resizeHeight" without using static methods. Mechanisms well fitted to unit
+ * tests. The class uses an instance to do this.
+ *
+ */
+
+public class UmlClassResizer {
+
+	private static UmlClassResizer singleton;
+
+	private static String RESIZE = Messages.UmlClassResizer_RESIZE;
+
+	private UmlClassResizer() {
+
+	}
+
+	public static UmlClassResizer getInstance() {
+		if (singleton == null) {
+			singleton = new UmlClassResizer();
+		}
+		return singleton;
+	}
+
+	/**
+	 * See
+	 * {@link UmlClassResizer#resizeHeight(LayoutConstraint, TransactionalEditingDomain, int)}
+	 * for full description of meaning of resizeHeight. The method here replaces the
+	 * transactional editing domain by the global one and the layoutConstraint
+	 * parameter by the class (editPart - GEF level) including it.
+	 * 
+	 * @param umlClassEditPart
+	 *            the class (editPart - GEF level) that includes
+	 *            indirectly the layoutConstraint
+	 * @param height
+	 *            the new height of the class (notation level)
+	 * @throws ServiceException
+	 *             if the transaction cannot be done
+	 */
+	public void resizeHeight(ClassEditPart umlClassEditPart, int height) throws ServiceException {
+		if (umlClassEditPart.getModel() instanceof org.eclipse.gmf.runtime.notation.Node) {
+			resizeHeight(Node.class.cast(umlClassEditPart.getModel()), height);
+		}
+	}
+
+	/**
+	 * See
+	 * {@link UmlClassResizer#resizeHeight(LayoutConstraint, TransactionalEditingDomain, int)}
+	 * for full description of meaning of resizeHeight. The method here replaces the
+	 * transactional editing domain by the global one and the layoutConstraint
+	 * parameter by the class (notation level) including it.
+	 * 
+	 * @param umlClass
+	 *            the class (notation level) that includes the layoutConstraint
+	 * @param height
+	 *            the new height of the class (notation level)
+	 * @throws ServiceException
+	 *             if the transaction cannot be done
+	 */
+
+	protected void resizeHeight(Node umlClass, int height) throws ServiceException {
+		TransactionalEditingDomain editingDomain = ServiceUtilsForEObject.getInstance()
+				.getTransactionalEditingDomain(umlClass);
+		resizeHeight(umlClass.getLayoutConstraint(), editingDomain, height);
+
+	}
+
+	/**
+	 * See
+	 * {@link UmlClassResizer#resizeHeight(LayoutConstraint, TransactionalEditingDomain, int)}
+	 * for full description of meaning of resizeHeight. The method here replaces the
+	 * transactional editing domain by the global one.
+	 * 
+	 * @param layoutConstraint
+	 *            the layoutConstraint associated to the class
+	 * @param height
+	 *            the new height of the class (notation level)
+	 * @throws ServiceException
+	 *             if the transaction cannot be done
+	 */
+
+	protected void resizeHeight(LayoutConstraint layoutConstraint, int height) throws ServiceException {
+		TransactionalEditingDomain editingDomain = ServiceUtilsForEObject.getInstance()
+				.getTransactionalEditingDomain(layoutConstraint);
+		resizeHeight(layoutConstraint, editingDomain, height);
+	}
+
+	/**
+	 * Changing the height of a class is done by setting the height of the
+	 * layoutConstraint associated to the class (notation level). This setting
+	 * operation must be done through a transaction and so needs a
+	 * TransactionalEditingDomain. These are the 3 required parameters:
+	 * layoutConstraint, editingDomain and a height.
+	 * 
+	 * @param layoutConstraint
+	 *            the layoutConstraint associated to the class
+	 * @param editingDomain
+	 *            the transactional editing Domain required to perform
+	 *            a command
+	 * @param height
+	 *            the new height of the class (notation level)
+	 * @throws ServiceException
+	 *             if the transaction cannot be done
+	 */
+
+	protected void resizeHeight(LayoutConstraint layoutConstraint, TransactionalEditingDomain editingDomain, int height)
+			throws ServiceException {
+		editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain, RESIZE) {
+
+			@Override
+			protected void doExecute() {
+				realResizeHeight(layoutConstraint, height);
+			}
+		});
+	}
+
+	/**
+	 * This method is called by the transaction. It includes the real action to
+	 * performed. So it only needs layoutConstraint and the new height.
+	 * 
+	 * @param layoutConstraint
+	 *            the layoutConstraint associated to the class
+	 * @param height
+	 *            the new height of the class (notation level)
+	 */
+	protected void realResizeHeight(LayoutConstraint layoutConstraint, int height) {
+		layoutConstraint.eSet(NotationPackage.eINSTANCE.getSize_Height(), Integer.valueOf(height));
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/factory/BasicFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/factory/BasicFactory.java
new file mode 100644
index 0000000..e1cba00
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/factory/BasicFactory.java
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.factory;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+
+public abstract class BasicFactory {
+
+	private final static Activator LOGGER = Activator.getDefault();
+
+	protected boolean checkNullArgument(Object[] arguments) {
+		for (int i = 0; i < arguments.length; i += 2) {
+			if (arguments[i] == null) {
+				LOGGER.logNullParameter((String) arguments[i + 1]);
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/handlers/ClassEditionHandler.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/handlers/ClassEditionHandler.java
new file mode 100644
index 0000000..5439c45
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/handlers/ClassEditionHandler.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.handlers;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.uml.architecture.UMLDiagramTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.swt.SwtFactory;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class ClassEditionHandler extends AbstractHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection selection = HandlerUtil.getCurrentSelection(event);
+		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
+			ClassEditPart selectedUmlClass = getPossibleSelectedUmlClass(IStructuredSelection.class.cast(selection));
+			if (selectedUmlClass != null) {
+				SwtFactory.getInstance().createUmlClassHTMLEditionDialog(selectedUmlClass);
+			}
+		}
+		return null;
+	}
+
+	protected ClassEditPart getPossibleSelectedUmlClass(IStructuredSelection structuredSelection) {
+		if (structuredSelection.size() == 1) {
+			Object firstSelectedElement = structuredSelection.getFirstElement();
+			if (firstSelectedElement instanceof ClassEditPart) {
+				ClassEditPart classEditPart = ClassEditPart.class.cast(firstSelectedElement);
+				if (classEditPart.getParent().getModel() instanceof View) {
+					View parentEditPart = View.class.cast(classEditPart.getParent().getModel());
+					if (parentEditPart.getType().equals(UMLDiagramTypes.CLASS_DIAGRAM) ||
+							parentEditPart.getType().equals(PackagePackageableElementCompartmentEditPart.VISUAL_ID) ||
+							parentEditPart.getType().equals(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID)) {
+						return classEditPart;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/javascript/functions/FunctionsFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/javascript/functions/FunctionsFactory.java
new file mode 100644
index 0000000..66433b5
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/javascript/functions/FunctionsFactory.java
@@ -0,0 +1,44 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.javascript.functions;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.factory.BasicFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.swt.UmlClassHTMLEditionDialog;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+public class FunctionsFactory extends BasicFactory {
+
+	private static FunctionsFactory INSTANCE = new FunctionsFactory();
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 *
+	 * @return instance/factory
+	 */
+	public static FunctionsFactory getInstance() {
+		return INSTANCE;
+	}
+
+	public ObjectWithFunctions createObjectWithFunctions(UmlClassHTMLEditionDialog editionDialog, ClassEditPart classEditPart) {
+		return new ObjectWithFunctions(editionDialog, classEditPart);
+	}
+
+	private FunctionsFactory() {
+
+	}
+
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/javascript/functions/ObjectWithFunctions.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/javascript/functions/ObjectWithFunctions.java
new file mode 100644
index 0000000..694854e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/javascript/functions/ObjectWithFunctions.java
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.javascript.functions;
+
+import java.io.IOException;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.classcompartments.ClassExpander;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.classcompartments.ExpanderFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.AccessibleTypes;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.java2js.FromEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.java2js.JsonUmlClassFromEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.js2java.ToEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlClass;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.messages.Messages;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.swt.UmlClassHTMLEditionDialog;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+public class ObjectWithFunctions {
+
+	private UmlClassHTMLEditionDialog editionDialog;
+	private ClassEditPart classEditPart;
+	private static final Activator LOGGER = Activator.getDefault();
+
+
+	ObjectWithFunctions(UmlClassHTMLEditionDialog editionDialog, ClassEditPart classEditPart) {
+		super();
+		this.editionDialog = editionDialog;
+		this.classEditPart = classEditPart;
+	}
+
+	public void closeAndPerform(String classSpecificationInText) {
+
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			JsonUmlClass theClass = mapper.readValue(classSpecificationInText, JsonUmlClass.class);
+
+			ClassExpander expandCollapser = ExpanderFactory.getInstance().createExpanding(classEditPart, theClass);
+			expandCollapser.expandIfNecessary();
+
+			ToEditPartFactory.getInstance().createJsonUmlClassToEditPart(theClass, classEditPart);
+
+		} catch (IOException exception) {
+			LOGGER.logError(exception.toString(), exception);
+		}
+		editionDialog.closeAndPerform();
+	}
+
+	public String getAccessibleTypes() {
+
+		String[] qualifiedNameTypes = AccessibleTypes.getInstance().getAllAccessibleTypesUnderStringFormat(classEditPart);
+
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.enable(SerializationFeature.INDENT_OUTPUT);
+		try {
+			return mapper.writeValueAsString(qualifiedNameTypes);
+		} catch (JsonProcessingException exception) {
+			LOGGER.logError(exception.toString(), exception);
+		}
+		return null;
+	}
+
+	public String getProperties() {
+		try {
+
+			JsonUmlClassFromEditPart sourceClassEditPart = FromEditPartFactory.getInstance().createJsonUmlClassFromEditPart(classEditPart);
+			JsonUmlClass targetUmlClass = sourceClassEditPart.getTheClass();
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationFeature.INDENT_OUTPUT);
+			return mapper.writeValueAsString(targetUmlClass);
+		} catch (JsonProcessingException exception) {
+			LOGGER.logError(Messages.ObjectWithFunctions_JsonReadingProblem, exception);
+		} catch (Exception exception) {
+			LOGGER.logError(exception.toString(), exception);
+		}
+		return null;
+
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/AccessibleTypes.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/AccessibleTypes.java
new file mode 100644
index 0000000..a740787
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/AccessibleTypes.java
@@ -0,0 +1,209 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.PackageableElement;
+import org.eclipse.uml2.uml.PrimitiveType;
+
+/**
+ * This class is a set of helping functionalities to get types that are
+ * accessible from a uml class, it means, in the same model. These
+ * functionalities can be accessed through the instance/singleton of this class.
+ *
+ */
+public class AccessibleTypes {
+
+	private static AccessibleTypes instance;
+
+	/**
+	 * The instance to use for accessing the helping functionalities.
+	 *
+	 * @return the instance.
+	 */
+	public static AccessibleTypes getInstance() {
+		if (instance == null) {
+			instance = new AccessibleTypes();
+		}
+		return instance;
+	}
+
+	private AccessibleTypes() {
+		// to prevent instantication
+	}
+
+	/**
+	 * This method gets the type corresponding to the qualifiedName (parameter) in
+	 * the context of a class (parameter).
+	 *
+	 * @param qualifiedName
+	 *            qualifiedName of the type.
+	 * @param zeClass
+	 *            look in the context of this class
+	 * @return the corresponding type (if any)
+	 */
+	public Namespace getEquivalentType(String qualifiedName, org.eclipse.uml2.uml.Class zeClass) {
+		if (qualifiedName != null && zeClass != null) {
+			Namespace[] accessibleTypes = getAllAccessibleTypes(zeClass);
+			for (Namespace element : accessibleTypes) {
+				if (element.getQualifiedName().equals(qualifiedName)) {
+					return element;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * This method gets the referenced class (data-level) in the class edit part.
+	 *
+	 * @param editPart
+	 *            the class edit part to look into
+	 * @return the corresponding real class (data level).
+	 */
+	private org.eclipse.uml2.uml.Class getClassFromEditPart(ClassEditPart editPart) {
+		if (editPart != null && editPart.getModel() instanceof Shape) {
+			Shape model = Shape.class.cast(editPart.getModel());
+			if (model.getElement() instanceof org.eclipse.uml2.uml.Class) {
+				return org.eclipse.uml2.uml.Class.class.cast(model.getElement());
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get the list of all types in the context of the edit part (parameter) under
+	 * string format
+	 *
+	 * @param editPart
+	 *            the class edit part to look into
+	 * @return a list of string corresponding to the qualified name of all found
+	 *         types
+	 */
+	public String[] getAllAccessibleTypesUnderStringFormat(ClassEditPart editPart) {
+		return getAllAccessibleTypesUnderStringFormat(getClassFromEditPart(editPart));
+	}
+
+	/**
+	 * Get the list of all types in the context of the class (parameter) under
+	 * string format
+	 *
+	 * @param zeClass
+	 *            the class to look into
+	 * @return a list of string corresponding to the qualified name of all found
+	 *         types
+	 */
+	private String[] getAllAccessibleTypesUnderStringFormat(org.eclipse.uml2.uml.Class zeClass) {
+		if (zeClass == null) {
+			String[] emptyList = {};
+			return emptyList;
+		} else {
+			Namespace[] accessibleTypes = getAllAccessibleTypes(zeClass);
+			String[] qualifiedNameTypes = new String[accessibleTypes.length];
+			for (int i = 0; i < accessibleTypes.length; i++) {
+				qualifiedNameTypes[i] = accessibleTypes[i].getQualifiedName();
+			}
+			return qualifiedNameTypes;
+		}
+	}
+
+	/**
+	 * Get the list of all types in the context of the class (parameter)
+	 *
+	 * @param zeClass
+	 *            the class to look into
+	 * @return a list of types (Namespace instances)
+	 */
+	private Namespace[] getAllAccessibleTypes(org.eclipse.uml2.uml.Class zeClass) {
+
+		List<Namespace> accessibleTypes = new ArrayList<>();
+
+		EObject container = zeClass.eContainer();
+		while (container.eContainer() != null) {
+			container = container.eContainer();
+		}
+		if (container instanceof Model) {
+			org.eclipse.uml2.uml.Model theModel = Model.class.cast(container);
+			extractTypesFromPackage(theModel, accessibleTypes);
+			return accessibleTypes.toArray(new Namespace[0]);
+		} else {
+			Namespace[] emptyList = {};
+			return emptyList;
+		}
+	}
+
+	/**
+	 * Get the list of all types in a package (and its subpackages and nested
+	 * classes (in classes))
+	 *
+	 * @param aPackage
+	 *            the package to look into
+	 * @param accessibleTypes
+	 *            put the list in this parameter (reflexive function).
+	 */
+	private void extractTypesFromPackage(Package aPackage, List<Namespace> accessibleTypes) {
+		if (aPackage != null && accessibleTypes != null) {
+			for (PackageableElement element : aPackage.getPackagedElements()) {
+				if (element instanceof Package) {
+					extractTypesFromPackage(Package.class.cast(element), accessibleTypes);
+				} else if (element instanceof Enumeration) {
+					accessibleTypes.add(Enumeration.class.cast(element));
+				} else if (element instanceof DataType) {
+					accessibleTypes.add(DataType.class.cast(element));
+				} else if (element instanceof PrimitiveType) {
+					accessibleTypes.add(PrimitiveType.class.cast(element));
+				} else if (element instanceof org.eclipse.uml2.uml.Class) {
+					accessibleTypes.add(org.eclipse.uml2.uml.Class.class.cast(element));
+					extractTypesFromClass(org.eclipse.uml2.uml.Class.class.cast(element), accessibleTypes);
+				}
+
+			}
+		}
+	}
+
+	/**
+	 * Get the list of all types in a class (nested classes)
+	 *
+	 * @param aClass
+	 *            the class to look into
+	 * @param accessibleTypes
+	 *            put the list in this parameter (reflexive function).
+	 */
+	private void extractTypesFromClass(Class aClass, List<Namespace> accessibleTypes) {
+		if (aClass != null && accessibleTypes != null) {
+			for (Classifier element : aClass.getNestedClassifiers()) {
+				if (element instanceof org.eclipse.uml2.uml.Class) {
+					accessibleTypes.add(org.eclipse.uml2.uml.Class.class.cast(element));
+					extractTypesFromClass(org.eclipse.uml2.uml.Class.class.cast(element), accessibleTypes);
+				}
+
+			}
+		}
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/TypeHelper.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/TypeHelper.java
new file mode 100644
index 0000000..a2b9987
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/TypeHelper.java
@@ -0,0 +1,197 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.resource.UMLResource;
+
+/**
+ * This class is used to convert types between Java/Papyrus and Javascript/JSON.
+ * As for AccessibleTypes, this class needs a class to have the context in which
+ * looking for... a class always gives access to a model.
+ *
+ */
+public class TypeHelper {
+
+	private static final String LABEL_NO_CORRESPONDING_TYPE = ""; //$NON-NLS-1$
+	private static final String LABEL_NULL_TYPE = ""; //$NON-NLS-1$
+	static final String LABEL_STRING_TYPE = "String"; //$NON-NLS-1$
+	static final String LABEL_BOOLEAN_TYPE = "Boolean"; //$NON-NLS-1$
+	static final String LABEL_INTEGER_TYPE = "Integer"; //$NON-NLS-1$
+	static final String LABEL_REAL_TYPE = "Real"; //$NON-NLS-1$
+	static final String LABEL_SHORT_BOOLEAN_TYPE = "bool"; //$NON-NLS-1$
+	static final String LABEL_SHORT_INTEGER_TYPE = "int"; //$NON-NLS-1$
+
+	private Resource resource;
+	private org.eclipse.uml2.uml.Class clazz;
+
+	/**
+	 * Instantiates the instance with the class/context
+	 *
+	 * @param clazz
+	 *            the class which gives the context (its model)
+	 */
+	TypeHelper(org.eclipse.uml2.uml.Class clazz) {
+		this.resource = clazz.eResource();
+		this.clazz = clazz;
+	}
+
+	/**
+	 * Instantiates the instance with the class/context of the property (parameter)
+	 *
+	 * @param property
+	 *            the class, containing the property, gives the context (its
+	 *            model)
+	 */
+	TypeHelper(org.eclipse.uml2.uml.Property property) {
+		this.resource = property.eResource();
+		this.clazz = (org.eclipse.uml2.uml.Class) property.eContainer();
+	}
+
+	/**
+	 * Instantiates the instance with the class/context of the operation (parameter)
+	 *
+	 * @param operation
+	 *            the class, containing the operation, gives the context (its
+	 *            model)
+	 */
+	TypeHelper(org.eclipse.uml2.uml.Operation operation) {
+		this.resource = operation.eResource();
+		this.clazz = (org.eclipse.uml2.uml.Class) operation.eContainer();
+	}
+
+	/**
+	 * Gets the type corresponding to the name (that can be a qualified name)
+	 *
+	 * @param typeName
+	 *            (qualified) name of the type
+	 * @return the real type (String if no type was found)
+	 */
+	public org.eclipse.uml2.uml.Type getTypeFromName(String typeName) {
+		final PrimitiveType stringType = getPrimitiveType(LABEL_STRING_TYPE);
+		PrimitiveType type = stringType;
+		if (typeName != null) {
+			String lowerTypeName = typeName.toLowerCase();
+			if (lowerTypeName.equalsIgnoreCase(LABEL_SHORT_INTEGER_TYPE)
+					|| lowerTypeName.equalsIgnoreCase(LABEL_INTEGER_TYPE)) {
+				type = getPrimitiveType(LABEL_INTEGER_TYPE);
+			}
+
+			else if (lowerTypeName.equalsIgnoreCase(LABEL_STRING_TYPE)) {
+				type = getPrimitiveType(LABEL_STRING_TYPE);
+			}
+
+			else if (lowerTypeName.equalsIgnoreCase(LABEL_SHORT_BOOLEAN_TYPE)
+					|| lowerTypeName.equalsIgnoreCase(LABEL_BOOLEAN_TYPE)) {
+				type = getPrimitiveType(LABEL_BOOLEAN_TYPE);
+			}
+
+			else if (lowerTypeName.equalsIgnoreCase(LABEL_REAL_TYPE)) {
+				type = getPrimitiveType(LABEL_REAL_TYPE);
+			}
+
+			else {
+				Namespace equivalentType = AccessibleTypes.getInstance().getEquivalentType(typeName, clazz);
+				if (equivalentType instanceof Type) {
+					return Type.class.cast(equivalentType);
+				}
+			}
+		}
+		return type;
+	}
+
+	/**
+	 * Gets the name of a type given in parameter
+	 *
+	 * @param type
+	 *            the type to get the corresponding name
+	 * @return the corresponding name (can be qualified)
+	 */
+	public String getTypeNameForAGivenType(org.eclipse.uml2.uml.Type type) {
+		if (type == null) {
+			return LABEL_NULL_TYPE;
+		}
+		if (type.equals(getPrimitiveType(LABEL_INTEGER_TYPE))) {
+			return LABEL_INTEGER_TYPE;
+		}
+		if (type.equals(getPrimitiveType(LABEL_STRING_TYPE))) {
+			return LABEL_STRING_TYPE;
+		}
+		if (type.equals(getPrimitiveType(LABEL_BOOLEAN_TYPE))) {
+			return LABEL_BOOLEAN_TYPE;
+		}
+		if (type.equals(getPrimitiveType(LABEL_REAL_TYPE))) {
+			return LABEL_BOOLEAN_TYPE;
+		}
+		if (type instanceof org.eclipse.uml2.uml.Namespace) {
+			return Namespace.class.cast(type).getQualifiedName();
+		}
+		return LABEL_NO_CORRESPONDING_TYPE;
+	}
+
+	/**
+	 * Gets only primitive types for a given name
+	 *
+	 * @param primitiveTypeName
+	 *            name of a given primitive type
+	 * @return the primitive type
+	 */
+	private PrimitiveType getPrimitiveType(String primitiveTypeName) {
+		org.eclipse.uml2.uml.Package umlLibrary = load(resource.getResourceSet(),
+				URI.createURI(UMLResource.UML_PRIMITIVE_TYPES_LIBRARY_URI));
+		if (umlLibrary != null && (umlLibrary.getOwnedType(primitiveTypeName) instanceof PrimitiveType)) {
+			return PrimitiveType.class.cast(umlLibrary.getOwnedType(primitiveTypeName));
+		}
+		return null;
+	}
+
+	/**
+	 * Loads a package from a uri and a resourcesSet.
+	 *
+	 * @param resourceSet
+	 *            resourceSet (get from a class)
+	 * @param uri
+	 *            (the name/uri of the package)
+	 * @return the package
+	 */
+	protected static org.eclipse.uml2.uml.Package load(ResourceSet resourceSet, URI uri) {
+		try {
+
+			// Load the requested resource
+			Resource resource = resourceSet.getResource(uri, true);
+			// Get the first (should be only) package from it
+			Object aPackage = EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.Literals.PACKAGE);
+			if (aPackage instanceof org.eclipse.uml2.uml.Package) {
+				return org.eclipse.uml2.uml.Package.class
+						.cast(EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.Literals.PACKAGE));
+			}
+
+		} catch (WrappedException exception) {
+			Activator.getDefault().logError(exception.toString(), exception);
+		}
+		return null;
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/TypesFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/TypesFactory.java
new file mode 100644
index 0000000..96763ea
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/TypesFactory.java
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.factory.BasicFactory;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Property;
+
+public class TypesFactory extends BasicFactory {
+
+	private static TypesFactory instance;
+
+	private TypesFactory() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 *
+	 * @return instance/factory
+	 */
+	public static TypesFactory getInstance() {
+		if (instance == null) {
+			instance = new TypesFactory();
+		}
+		return instance;
+	}
+
+	public TypeHelper createTypeHelper(Class clazz) {
+		Object[] arguments = { clazz, "clazz" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+
+		return new TypeHelper(clazz);
+	}
+
+	public TypeHelper createTypeHelper(Property property) {
+		Object[] arguments = { property, "property" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+
+		return new TypeHelper(property);
+	}
+
+	public TypeHelper createTypeHelper(Operation operation) {
+		Object[] arguments = { operation, "operation" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+
+		return new TypeHelper(operation);
+	}
+
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/FromEditPartFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/FromEditPartFactory.java
new file mode 100644
index 0000000..0fcee90
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/FromEditPartFactory.java
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.java2js;
+
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.factory.BasicFactory;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+public class FromEditPartFactory extends BasicFactory {
+
+	private static FromEditPartFactory instance;
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 *
+	 * @return instance/factory
+	 */
+	public static FromEditPartFactory getInstance() {
+		if (instance == null) {
+			instance = new FromEditPartFactory();
+		}
+		return instance;
+	}
+
+	private FromEditPartFactory() {
+		// to prevent instantiation
+	}
+
+	public JsonUmlClassFromEditPart createJsonUmlClassFromEditPart(ClassEditPart classEditPart) {
+		Object[] arguments = { classEditPart, "classEditPart" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+		return new JsonUmlClassFromEditPart(classEditPart);
+
+	}
+
+	public JsonUmlOperationFromEditPart createJsonUmlOperationFromEditPart(OperationForClassEditPart operationEditPart) {
+		Object[] arguments = { operationEditPart, "operationEditPart" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+		return new JsonUmlOperationFromEditPart(operationEditPart);
+
+	}
+
+	public JsonUmlPropertyFromEditPart createJsonUmlPropertyFromEditPart(PropertyForClassEditPart propertyEditPart) {
+		Object[] arguments = { propertyEditPart, "propertyEditPart" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+		return new JsonUmlPropertyFromEditPart(propertyEditPart);
+
+	}
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlClassFromEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlClassFromEditPart.java
new file mode 100644
index 0000000..dc9c627
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlClassFromEditPart.java
@@ -0,0 +1,169 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.java2js;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonStructuresFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlClass;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * This class is dedicated to fed an instance of
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlClass}
+ * from a real Papyrus class represented by a class edit part:
+ * <OL>
+ * <LI>The constructor takes a class edit part as a parameter, creates an
+ * instance of UmlClass and invokes the following method</LI>
+ * <LI>The method {@link JsonUmlClassFromEditPart#createFromEditPart()} feeds the
+ * previous instance</LI>
+ * <LI>Finally, the method {@link JsonUmlClassFromEditPart#getClass()} allows to get
+ * the previous instance</LI>
+ * </OL>
+ *
+ *
+ */
+public class JsonUmlClassFromEditPart {
+
+	private JsonUmlClass theClass;
+	private ClassEditPart editPart;
+	private static final Activator LOGGER = Activator.getDefault();
+
+	/**
+	 * The constructor takes a class edit part as a parameter, creates an
+	 * instance of UmlClass and invokes {@link JsonUmlClassFromEditPart#createFromEditPart()}
+	 *
+	 * @param editPart
+	 *            the edit part referenced the real class.
+	 */
+	public JsonUmlClassFromEditPart(ClassEditPart editPart) {
+		super();
+		this.editPart = editPart;
+		this.theClass = JsonStructuresFactory.getInstance().createJsonUmlClass();
+		createFromEditPart();
+	}
+
+	/**
+	 * This method feeds the instance of UmlClass by exploring the nested
+	 * ClassNameEditPart, ClassAttributeCompartmentEditPart and
+	 * ClassOperationCompartmentEditPart to get data for name, properties and
+	 * operations. The method uses getName method and the both create*FromEdit ones.
+	 */
+	protected void createFromEditPart() {
+		List<?> children = editPart.getChildren();
+		for (Object child : children) {
+			if (child instanceof ClassNameEditPart || child instanceof ClassNameEditPartCN) {
+				getName((PapyrusCompartmentEditPart) child);
+			}
+			if (child instanceof ClassAttributeCompartmentEditPart || child instanceof ClassAttributeCompartmentEditPartCN) {
+				createPropertiesFromEdit((ResizeableListCompartmentEditPart) child);
+			}
+			if (child instanceof ClassOperationCompartmentEditPart || child instanceof ClassOperationCompartmentEditPartCN) {
+				createOperationsFromEdit((ResizeableListCompartmentEditPart) child);
+			}
+		}
+	}
+
+	/**
+	 * This method will explore the properties compartment and for each found
+	 * property, it will use the class {@link JsonUmlPropertyFromEditPart} to create and
+	 * feed an instance of UmlProperty.
+	 *
+	 * @param compartment
+	 *            the properties compartment.
+	 */
+	private void createPropertiesFromEdit(ResizeableListCompartmentEditPart compartment) {
+		for (Object child : compartment.getChildren()) {
+			if (child instanceof PropertyForClassEditPart) {
+				JsonUmlPropertyFromEditPart mapper = FromEditPartFactory.getInstance().createJsonUmlPropertyFromEditPart((PropertyForClassEditPart) child);
+				this.theClass.getProperties().add(mapper.getProperty());
+			}
+		}
+	}
+
+	/**
+	 * This method will explore the operations compartment and for each found
+	 * operation, it will use the class {@link JsonUmlOperationFromEditPart} to create
+	 * and feed an instance of UmlOperation.
+	 *
+	 * @param compartment
+	 *            the operations compartment.
+	 */
+	private void createOperationsFromEdit(ResizeableListCompartmentEditPart compartment) {
+		for (Object child : compartment.getChildren()) {
+			if (child instanceof OperationForClassEditPart) {
+				JsonUmlOperationFromEditPart mapper = FromEditPartFactory.getInstance().createJsonUmlOperationFromEditPart(OperationForClassEditPart.class.cast(child));
+				this.theClass.getOperations().add(mapper.getOperation());
+			}
+		}
+	}
+
+	/**
+	 * This method uses the ClassNameEditPart to get the name of the class (and set
+	 * it within the instance of UmlClass).
+	 *
+	 * @param classNameEditPart
+	 *            the class Name edit part
+	 */
+	private void getName(PapyrusCompartmentEditPart classNameEditPart) {
+		if (classNameEditPart.getModel() instanceof View) {
+			View node = View.class.cast(classNameEditPart.getModel());
+			if (node.getElement() instanceof NamedElement) {
+				NamedElement clazz = NamedElement.class.cast(node.getElement());
+				theClass.setName(clazz.getName());
+			} else {
+				LOGGER.logCastProblem("node.getElement()", NamedElement.class); //$NON-NLS-1$
+			}
+		} else {
+			LOGGER.logCastProblem("classNameEditPart.getModel()", View.class); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * Gets the instance of UmlClass. It may be not fed.
+	 *
+	 * @return the instance of UmlClass.
+	 */
+	public JsonUmlClass getTheClass() {
+		return theClass;
+	}
+
+	/**
+	 * Sets the instance of UmlClass.
+	 *
+	 * @param theClass
+	 *            the instance of UmlClass
+	 */
+	protected void setTheClass(JsonUmlClass theClass) {
+		this.theClass = theClass;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlOperationFromEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlOperationFromEditPart.java
new file mode 100644
index 0000000..7b0f2a2
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlOperationFromEditPart.java
@@ -0,0 +1,119 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.java2js;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.TypesFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonStructuresFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlOperation;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlOperationParameter;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+
+/**
+ * This class is dedicated to fed an instance of
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlOperation}
+ * from a real Papyrus operation represented by a operation edit part:
+ * <OL>
+ * <LI>The constructor takes a operation edit part as a parameter, creates an
+ * instance of UmlOperation, gets the org.eclipse.uml2.uml.Operation indirectly
+ * referenced by the operation edit part and invokes the following method</LI>
+ * <LI>The method {@link JsonUmlOperationFromEditPart#createFromEditPart()} feeds
+ * the previous instance</LI>
+ * <LI>Finally, the method {@link JsonUmlOperationFromEditPart#getOperation()}
+ * allows to get the previous instance</LI>
+ * </OL>
+ *
+ */
+public class JsonUmlOperationFromEditPart {
+
+	private JsonUmlOperation operation;
+	protected org.eclipse.uml2.uml.Operation sourceOperation;
+	private static final Activator LOGGER = Activator.getDefault();
+
+	/**
+	 * The constructor takes a operation edit part as a parameter, creates an
+	 * instance of UmlOperation, get the org.eclipse.uml2.uml.Operation indirectly
+	 * referenced by the operation edit part and invokes
+	 * {@link JsonUmlOperationFromEditPart#createFromEditPart()}.
+	 * 
+	 * @param editPart
+	 *            the edit part indirectly containing the the real operation
+	 */
+	public JsonUmlOperationFromEditPart(OperationForClassEditPart editPart) {
+		super();
+		this.operation = JsonStructuresFactory.getInstance().createJsonUmlOperation();
+		if (editPart.getModel() instanceof View) {
+			View visualStuff = View.class.cast(editPart.getModel());
+			if (visualStuff.getElement() instanceof Operation) {
+				sourceOperation = Operation.class.cast(visualStuff.getElement());
+				createFromEditPart();
+			} else {
+				LOGGER.logCastProblem("visualStuff.getElement()", Operation.class); //$NON-NLS-1$
+			}
+		} else {
+			LOGGER.logCastProblem("editPart.getModel()", View.class); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * This method feeds the instance of UmlOperation by accessing all the
+	 * properties of the instance of org.eclipse.uml2.uml.Operation (get in the
+	 * constructor) and also all its parameters.
+	 */
+	protected void createFromEditPart() {
+		this.operation.setName(sourceOperation.getName());
+		this.operation.setVisibility(sourceOperation.getVisibility().getLiteral());
+		this.operation.setUnique(sourceOperation.isUnique());
+		this.operation.setOrdered(sourceOperation.isOrdered());
+
+		for (Parameter papyrusParameter : sourceOperation.getOwnedParameters()) {
+			JsonUmlOperationParameter parameter = JsonStructuresFactory.getInstance().createJsonUmlOperationParameter();
+			parameter.setName(papyrusParameter.getName());
+			parameter.setType(TypesFactory.getInstance().createTypeHelper(sourceOperation).getTypeNameForAGivenType(papyrusParameter.getType()));
+			parameter.setDirection(papyrusParameter.getDirection().getLiteral());
+			parameter.setLower(papyrusParameter.getLower());
+			parameter.setUpper(papyrusParameter.getUpper());
+			parameter.setUnique(papyrusParameter.isUnique());
+			parameter.setOrdered(papyrusParameter.isOrdered());
+			operation.getParameters().add(parameter);
+		}
+
+	}
+
+	/**
+	 * Gets the instance of UmlOperation. It may be not fed.
+	 * 
+	 * @return the instance of UmlOperation.
+	 */
+	public JsonUmlOperation getOperation() {
+		return operation;
+	}
+
+	/**
+	 * Sets the instance of UmlOperation.
+	 * 
+	 * @param operation
+	 *            the instance of UmlOperation
+	 */
+	public void setOperation(JsonUmlOperation operation) {
+		this.operation = operation;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlPropertyFromEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlPropertyFromEditPart.java
new file mode 100644
index 0000000..38a8959
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/java2js/JsonUmlPropertyFromEditPart.java
@@ -0,0 +1,115 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.java2js;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.TypesFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonStructuresFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlProperty;
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * This class is dedicated to fed an instance of
+ * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlProperty}
+ * from a real Papyrus property represented by a property edit part:
+ * <OL>
+ * <LI>The constructor takes a property edit part as a parameter, creates an
+ * instance of UmlProperty, gets the org.eclipse.uml2.uml.Property indirectly
+ * referenced by the property edit part and invokes the following method</LI>
+ * <LI>The method {@link JsonUmlPropertyFromEditPart#createFromEditPart()} feeds the
+ * previous instance</LI>
+ * <LI>Finally, the method {@link JsonUmlPropertyFromEditPart#getProperty()} allows
+ * to get the previous instance</LI>
+ * </OL>
+ *
+ */
+public class JsonUmlPropertyFromEditPart {
+
+	private JsonUmlProperty property;
+	protected Property sourceProperty;
+	private static final Activator LOGGER = Activator.getDefault();
+
+	/**
+	 * The constructor takes a property edit part as a parameter, creates an
+	 * instance of UmlProperty, get the org.eclipse.uml2.uml.Property indirectly
+	 * referenced by the property edit part and invokes
+	 * {@link JsonUmlPropertyFromEditPart#createFromEditPart()}.
+	 * 
+	 * @param editPart
+	 *            the edit part indirectly containing the the real property
+	 */
+	public JsonUmlPropertyFromEditPart(PropertyForClassEditPart editPart) {
+		super();
+		this.property = JsonStructuresFactory.getInstance().createJsonUmlProperty();
+
+		if (editPart.getModel() instanceof View) {
+			View visualStuff = View.class.cast(editPart.getModel());
+			if (visualStuff.getElement() instanceof Property) {
+				sourceProperty = Property.class.cast(visualStuff.getElement());
+				createFromEditPart();
+			} else {
+				LOGGER.logCastProblem("visualStuff.getElement()", Property.class); //$NON-NLS-1$
+			}
+
+		} else {
+			LOGGER.logCastProblem("editPart.getModel()", View.class); //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * This method feeds the instance of UmlProperty by accessing all the
+	 * properties of the instance of org.eclipse.uml2.uml.Property (get in the
+	 * constructor).
+	 */
+	protected void createFromEditPart() {
+		this.property.setName(sourceProperty.getName());
+		this.property.setDerived(sourceProperty.isDerived());
+		this.property.setVisibility(sourceProperty.getVisibility().getLiteral());
+		this.property.setType(TypesFactory.getInstance().createTypeHelper(sourceProperty).getTypeNameForAGivenType(sourceProperty.getType()));
+		this.property.setLower(sourceProperty.getLower());
+		this.property.setUpper(sourceProperty.getUpper());
+		this.property.setUnique(sourceProperty.isUnique());
+		this.property.setOrdered(sourceProperty.isOrdered());
+		this.property.setReadOnly(sourceProperty.isReadOnly());
+		this.property.setDerivedUnion(sourceProperty.isDerivedUnion());
+		this.property.setId(sourceProperty.isID());
+
+	}
+
+	/**
+	 * Gets the instance of UmlProperty. It may be not fed.
+	 * 
+	 * @return the instance of UmlProperty.
+	 */
+	public JsonUmlProperty getProperty() {
+		return property;
+	}
+
+	/**
+	 * Sets the instance of UmlProperty.
+	 * 
+	 * @param property
+	 *            the instance of UmlProperty
+	 */
+	public void setProperty(JsonUmlProperty property) {
+		this.property = property;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlClassToEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlClassToEditPart.java
new file mode 100644
index 0000000..e5894a3
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlClassToEditPart.java
@@ -0,0 +1,356 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.js2java;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlClass;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlOperation;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlProperty;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.messages.Messages;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * This class aims at fulfilling the class edit part according to a textual
+ * definition of a class (UmlClass) with cascading actions for properties and
+ * operations.<BR>
+ * It has to add new properties/operations and removing previous existing ones
+ * that do not appear in the textual definition anymore. That's the reason there
+ * are a lot of java attributes: to memorize previous existing elements.
+ *
+ */
+public class JsonUmlClassToEditPart {
+
+	private static final Activator LOGGER = Activator.getDefault();
+
+	private JsonUmlClass theClass;
+	private ClassEditPart editPart;
+	private org.eclipse.uml2.uml.Class papyrusUmlClass;
+	private TransactionalEditingDomain editingDomain;
+	private ResizeableListCompartmentEditPart attributeCompartment;
+	private ResizeableListCompartmentEditPart operationCompartment;
+	private Map<String, org.eclipse.uml2.uml.Property> properties;
+	private Map<String, PropertyForClassEditPart> propertyEditParts;
+	private Map<String, OperationForClassEditPart> operationEditParts;
+	private Map<String, org.eclipse.uml2.uml.Operation> operations;
+
+	/**
+	 * This constructor takes a textual definition (UmlClass) and a Papyrus Class
+	 * (referenced by the class edit part).<BR>
+	 * The constructor creates all the structures to remember the state of the class
+	 * before the edition.<BR>
+	 * Finally the constructor launches all the process: fetch previous existing
+	 * element and the mapping (replacing/adding/removing).
+	 *
+	 * @param theClass
+	 *            textual definition.
+	 * @param editPart
+	 *            a Papyrus Class (GEF-level)
+	 */
+	public JsonUmlClassToEditPart(JsonUmlClass theClass, ClassEditPart editPart) {
+		super();
+		try {
+			this.editPart = editPart;
+			this.theClass = theClass;
+			this.properties = new HashMap<>();
+			this.propertyEditParts = new HashMap<>();
+			this.operations = new HashMap<>();
+			this.operationEditParts = new HashMap<>();
+
+			fetchPapyrusUmlElements();
+			updatePapyrusUmlClassAccordingTextualVersion();
+		} catch (Exception ex) {
+			LOGGER.logError(ex.toString(), ex);
+		}
+	}
+
+	/**
+	 * Load all the elements of the Papyrus class (the update is not done yet). This
+	 * method calls the other fetch methods.
+	 */
+	private void fetchPapyrusUmlElements() {
+
+		if (this.editPart.getModel() instanceof View) {
+
+			View model = View.class.cast(this.editPart.getModel());
+
+			if (model.getElement() instanceof org.eclipse.uml2.uml.Class) {
+
+				this.papyrusUmlClass = org.eclipse.uml2.uml.Class.class.cast(model.getElement());
+
+				List<?> children = editPart.getChildren();
+				for (Object child : children) {
+					if (child instanceof ClassAttributeCompartmentEditPart || child instanceof ClassAttributeCompartmentEditPartCN) {
+						this.attributeCompartment = ResizeableListCompartmentEditPart.class.cast(child);
+						fetchAllAttributes();
+					} else if (child instanceof ClassOperationCompartmentEditPart || child instanceof ClassOperationCompartmentEditPartCN) {
+						this.operationCompartment = ResizeableListCompartmentEditPart.class.cast(child);
+						fetchAllOperations();
+					}
+				}
+
+				try {
+					this.editingDomain = ServiceUtilsForEObject.getInstance()
+							.getTransactionalEditingDomain(papyrusUmlClass);
+				} catch (ServiceException ex) {
+					LOGGER.logError(ex.toString(), ex);
+				}
+			} else {
+				LOGGER.logCastProblem("model.getElement()", org.eclipse.uml2.uml.Class.class); //$NON-NLS-1$
+			}
+		} else {
+			LOGGER.logCastProblem("editPart.getModel()", View.class); //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * This methods create a global command encapsulating the commands for updating
+	 * the name, the properties and the operations. It calls the process* methods.
+	 */
+	private void updatePapyrusUmlClassAccordingTextualVersion() {
+
+		Command globalCommand = createGlobalCommand();
+		if (!theClass.getName().equals(papyrusUmlClass.getName())) {
+			globalCommand = globalCommand.chain(commandForSettingName());
+		}
+		globalCommand = processProperties(globalCommand);
+		globalCommand = processOperations(globalCommand);
+
+		editingDomain.getCommandStack().execute(globalCommand);
+
+	}
+
+	/**
+	 * This method creates an empty command that will be used to give a name to the
+	 * global command.
+	 *
+	 * @return the empty/naming command.
+	 */
+	private RecordingCommand createGlobalCommand() {
+
+		return new RecordingCommand(editingDomain, Messages.JsonUmlClassToEditPart_TextualEditionOf_TitleCommand + this.papyrusUmlClass.getName()) {
+			@Override
+			protected void doExecute() {
+				// no actions to perform
+				// it's just a command to give a name to the global command.
+			}
+		};
+	}
+
+	/**
+	 * This method creates a command to updating/setting the name of the class.
+	 *
+	 * @return the naming command.
+	 */
+	private Command commandForSettingName() {
+		return new RecordingCommand(editingDomain, Messages.JsonUmlClassToEditPart_SetNameCommand_TitleCommand) {
+			@Override
+			protected void doExecute() {
+				papyrusUmlClass.setName(theClass.getName());
+			}
+		};
+	}
+
+	/**
+	 * This method call {@link JsonUmlClassToEditPart#fetchAttribute(Object)} for each
+	 * attribute in the properties compartment.
+	 */
+	private void fetchAllAttributes() {
+		for (Object child : attributeCompartment.getChildren()) {
+			if (child instanceof PropertyForClassEditPart) {
+				fetchAttribute(PropertyForClassEditPart.class.cast(child));
+			}
+		}
+	}
+
+	/**
+	 * This method call {@link JsonUmlClassToEditPart#fetchOperation(Object)} for each
+	 * operation in the operations compartment.
+	 */
+	private void fetchAllOperations() {
+		for (Object child : operationCompartment.getChildren()) {
+			if (child instanceof OperationForClassEditPart) {
+				fetchOperation(OperationForClassEditPart.class.cast(child));
+			}
+		}
+	}
+
+	/**
+	 * This method gets real property and its associated element (edit part and the
+	 * notation element) and stores them in the corresponding maps.
+	 *
+	 * @param child
+	 *            the property edit part
+	 */
+	private void fetchAttribute(PropertyForClassEditPart propertyEditPart) {
+		if (propertyEditPart.getModel() instanceof View) {
+			View visualStuff = View.class.cast(propertyEditPart.getModel());
+			if (visualStuff.getElement() instanceof Property) {
+				Property property = Property.class.cast(visualStuff.getElement());
+
+				this.propertyEditParts.put(property.getName(), propertyEditPart);
+				this.properties.put(property.getName(), property);
+			} else {
+				LOGGER.logCastProblem("visualStuff.getElement()", Property.class); //$NON-NLS-1$
+			}
+		} else {
+			LOGGER.logCastProblem("propertyEditPart.getModel()", View.class); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * This method gets real operation and its associated element (edit part and the
+	 * notation element) and stores them in the corresponding maps.
+	 *
+	 * @param child
+	 *            the operation edit part
+	 */
+	private void fetchOperation(OperationForClassEditPart operationEditPart) {
+		if (operationEditPart.getModel() instanceof View) {
+			View visualStuff = View.class.cast(operationEditPart.getModel());
+			if (visualStuff.getElement() instanceof Operation) {
+				Operation operation = (Operation) visualStuff.getElement();
+
+				this.operationEditParts.put(operation.getName(), operationEditPart);
+				this.operations.put(operation.getName(), operation);
+			} else {
+				LOGGER.logCastProblem("visualStuff.getElement()", Operation.class); //$NON-NLS-1$
+			}
+		} else {
+			LOGGER.logCastProblem("operationEditPart.getModel()", View.class); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * Get the list of the real properties found in the class edit part.
+	 *
+	 * @return list of the real properties
+	 */
+	private Property[] getAllAttributes() {
+		return this.properties.values().toArray(new Property[0]);
+	}
+
+	/**
+	 * Get the list of the real operations found in the class edit part.
+	 *
+	 * @return list of the real operations
+	 */
+	private Operation[] getAllOperations() {
+		return this.operations.values().toArray(new Operation[0]);
+	}
+
+	/**
+	 * This method updates the properties.<BR>
+	 * First, for each property in the textual definition of the class, it looks if
+	 * a property in the papyrus class exists with the same name. If it is, it
+	 * updates it and removes it from the list of properties to actually remove. If
+	 * not, it creates a new property.<BR>
+	 * Second, all the existing properties that have not been "met" are removed.
+	 *
+	 * @param globalCommand
+	 *            the global command on which all the properties edition
+	 *            commands will be chained with.
+	 * @return the new global command.
+	 */
+	private Command processProperties(Command globalCommand) {
+		try {
+
+			for (JsonUmlProperty property : theClass.getProperties()) {
+				Property papyrusProperty = properties.get(property.getName());
+				if (papyrusProperty != null) {
+					globalCommand = globalCommand
+							.chain(ToEditPartFactory.getInstance().createJsonUmlPropertyToEditPart(editingDomain, editPart, attributeCompartment)
+									.commandForUpdatingProperty(property, papyrusProperty));
+
+					properties.remove(property.getName(), papyrusProperty);
+				} else {
+					globalCommand = globalCommand
+							.chain(ToEditPartFactory.getInstance().createJsonUmlPropertyToEditPart(editingDomain, editPart, attributeCompartment)
+									.commandForAddingProperty(property));
+				}
+			}
+			for (Property papyrusProperty : getAllAttributes()) {
+				globalCommand = globalCommand
+						.chain(ToEditPartFactory.getInstance().createJsonUmlPropertyToEditPart(editingDomain, editPart, attributeCompartment)
+								.commandForRemovingProperty(propertyEditParts, papyrusProperty));
+			}
+		} catch (Exception ex) {
+			LOGGER.logError(ex.toString(), ex);
+		}
+		return globalCommand;
+	}
+
+	/**
+	 * This method updates the operations.<BR>
+	 * First, for each operation in the textual definition of the class, it looks if
+	 * an operation in the papyrus class exists with the same name. If it is, it
+	 * updates it and removes it from the list of properties to actually remove. If
+	 * not, it creates a new operation.<BR>
+	 * Second, all the existing operations that have not been "met" are removed.
+	 *
+	 * @param globalCommand
+	 *            the global command on which all the operations edition
+	 *            commands will be chained with.
+	 * @return the new global command.
+	 */
+	private Command processOperations(Command globalCommand) {
+		try {
+			for (JsonUmlOperation operation : theClass.getOperations()) {
+				Operation papyrusOperation = operations.get(operation.getName());
+				if (papyrusOperation != null) {
+					globalCommand = globalCommand
+							.chain(ToEditPartFactory.getInstance().createJsonUmlOperationToEditPart(editingDomain, editPart, operationCompartment)
+									.commandForUpdatingOperation(operation, papyrusOperation));
+					operations.remove(operation.getName(), papyrusOperation);
+				} else {
+					globalCommand = globalCommand
+							.chain(ToEditPartFactory.getInstance().createJsonUmlOperationToEditPart(editingDomain, editPart, operationCompartment)
+									.commandForAddingOperation(operation));
+				}
+			}
+			for (Operation papyrusOperation : getAllOperations()) {
+				globalCommand = globalCommand
+						.chain(ToEditPartFactory.getInstance().createJsonUmlOperationToEditPart(editingDomain, editPart, operationCompartment)
+								.commandForRemovingOperation(operationEditParts, papyrusOperation));
+			}
+		} catch (Exception ex) {
+			LOGGER.logError(ex.toString(), ex);
+		}
+		return globalCommand;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlOperationToEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlOperationToEditPart.java
new file mode 100644
index 0000000..89602ab
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlOperationToEditPart.java
@@ -0,0 +1,256 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.js2java;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.Request;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.TypesFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlOperation;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlOperationParameter;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.messages.Messages;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.UMLPackage.Literals;
+import org.eclipse.uml2.uml.VisibilityKind;
+
+/**
+ * Instance of this class is dedicated to the creation of commands for editing
+ * operations. It means
+ * <UL>
+ * <LI>creating an operation</LI>
+ * <LI>updating an operation</LI>
+ * <LI>deleting an operation</LI>
+ * </UL>
+ *
+ */
+public class JsonUmlOperationToEditPart {
+
+	private static final Activator LOGGER = Activator.getDefault();
+
+	private TransactionalEditingDomain editingDomain;
+	private ClassEditPart editPart;
+	private ResizeableListCompartmentEditPart operationCompartment;
+
+	/**
+	 * The constructor needs the editingDomain for the transaction, the class edit
+	 * part and operation compartment edit part.
+	 *
+	 * @param editingDomain
+	 *            needed for the transaction
+	 * @param editPart
+	 *            needed for the creation of new operation
+	 * @param operationCompartment
+	 *            needed for the creation of new operation
+	 */
+	public JsonUmlOperationToEditPart(TransactionalEditingDomain editingDomain, ClassEditPart editPart,
+			ResizeableListCompartmentEditPart operationCompartment) {
+		super();
+		this.editingDomain = editingDomain;
+		this.editPart = editPart;
+		this.operationCompartment = operationCompartment;
+	}
+
+	/**
+	 * This method creates an operation (notation level) and returns the real
+	 * operation (data level).
+	 *
+	 * @return the real uml operation (data level)
+	 */
+	private Operation createVisualOperation() {
+		try {
+			GraphicalEditPart parentEditPart = GraphicalEditPart.class.cast(editPart.getParent());
+
+			CreateViewRequest requestToCreateAVisualOperation = CreateViewRequestFactory.getCreateShapeRequest(
+					UMLElementTypes.Operation_ClassOperationLabel, parentEditPart.getDiagramPreferencesHint());
+			org.eclipse.gef.commands.Command commandToCreateAVisualOperation = operationCompartment
+					.getCommand(requestToCreateAVisualOperation);
+			commandToCreateAVisualOperation.execute();
+			Collection<?> returnValues = DiagramCommandStack.getReturnValues(commandToCreateAVisualOperation);
+			for (Object returnValue : returnValues) {
+				if (returnValue instanceof CreateElementRequestAdapter) {
+					CreateElementRequestAdapter adapter = CreateElementRequestAdapter.class.cast(returnValue);
+					if (adapter.resolve() instanceof Operation) {
+						return Operation.class.cast(adapter.resolve());
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOGGER.logError(ex.toString(), ex);
+		}
+		return null;
+	}
+
+	/**
+	 * This method returns the command for creating an operation based on a textual
+	 * definition (UmlOperation). The method just uses commandForUpdatingOperation
+	 * but with an empty operation that it creates.
+	 *
+	 * @param operation
+	 *            textual definition of the operation
+	 * @return the creation command.
+	 */
+	protected Command commandForAddingOperation(JsonUmlOperation operation) {
+		return commandForUpdatingOperation(operation, null);
+	}
+
+	/**
+	 * This method returns the command for updating an existing operation based on a
+	 * textual definition (UmlOperation).
+	 *
+	 * @param operation
+	 *            textual definition of the operation
+	 * @param concretePapyrusOperation
+	 *            the existing and real operation (data level).
+	 * @return the updating command
+	 */
+	protected Command commandForUpdatingOperation(JsonUmlOperation operation, Operation papyrusOperation) {
+		return new RecordingCommand(editingDomain,
+				(papyrusOperation == null ? Messages.JsonUmlOperationToEditPart_Add_TitleCommand : Messages.JsonUmlOperationToEditPart_Update_TitleCommand) + operation.getName()) {
+			@Override
+			protected void doExecute() {
+
+				Operation concretePapyrusOperation = papyrusOperation;
+
+				concretePapyrusOperation = createOperationIfNull(concretePapyrusOperation);
+
+				processNameProperty(operation, concretePapyrusOperation);
+				processVisibilityProperty(operation, concretePapyrusOperation);
+
+				while (!concretePapyrusOperation.getOwnedParameters().isEmpty()) {
+					destroyParameter(concretePapyrusOperation.getOwnedParameters().get(0));
+				}
+
+				for (JsonUmlOperationParameter parameter : operation.getParameters()) {
+					// I did not found UMLElementTypes for parameter in order to use
+					// CreateElementRequest
+					Parameter papyrusParameter = concretePapyrusOperation.createOwnedParameter(parameter.getName(),
+							TypesFactory.getInstance().createTypeHelper(concretePapyrusOperation)
+									.getTypeFromName(parameter.getType()));
+
+					// Multiplicity - Lower
+					papyrusParameter.setLower(parameter.getLower());
+
+					// Multiplicity - Upper
+					papyrusParameter.setUpper(parameter.getUpper());
+
+					// Direction
+					papyrusParameter.setDirection(ParameterDirectionKind.get(parameter.getDirection()));
+
+					// Ordered
+					papyrusParameter.setIsOrdered(parameter.isOrdered());
+
+					// Unique
+					papyrusParameter.setIsUnique(parameter.isUnique());
+
+					// Sequence - not found
+
+				}
+
+			}
+		};
+	}
+
+	/**
+	 * This method is for constructing a command that removes an operation (data
+	 * level) from a class
+	 *
+	 * @param operationEditParts
+	 *            the list of operations of the class
+	 * @param papyrusOperation
+	 *            the real operation
+	 * @return the removing command
+	 */
+	protected Command commandForRemovingOperation(Map<String, OperationForClassEditPart> operationEditParts,
+			Operation papyrusOperation) {
+		return new RecordingCommand(editingDomain, Messages.JsonUmlOperationToEditPart_Remove_TitleCommand + papyrusOperation.getName()) {
+			@Override
+			protected void doExecute() {
+				try {
+					OperationForClassEditPart operationEditPart = operationEditParts.get(papyrusOperation.getName());
+
+					Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+					org.eclipse.gef.commands.Command command2 = operationEditPart.getCommand(deleteViewRequest);
+					operationEditPart.getDiagramEditDomain().getDiagramCommandStack().execute(command2);
+
+				} catch (Exception ex) {
+					LOGGER.logError(ex.toString(), ex);
+				}
+			}
+		};
+	}
+
+	private Command createSetCommand(SetRequest setRequest, Operation papyrusOperation) {
+		IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(papyrusOperation);
+		ICommand setCommand = commandProvider.getEditCommand(setRequest);
+		return new GMFtoEMFCommandWrapper(setCommand);
+	}
+
+	private Operation createOperationIfNull(Operation papyrusOperation) {
+		if (papyrusOperation == null) {
+			papyrusOperation = createVisualOperation();
+		}
+		return papyrusOperation;
+	}
+
+	private void processNameProperty(JsonUmlOperation operation, Operation papyrusOperation) {
+		if (!papyrusOperation.getName().equals(operation.getName())) {
+			createSetCommand(new SetRequest(papyrusOperation, Literals.NAMED_ELEMENT__NAME, operation.getName()),
+					papyrusOperation).execute();
+		}
+	}
+
+	private void processVisibilityProperty(JsonUmlOperation operation, Operation papyrusOperation) {
+		VisibilityKind visibility = VisibilityKind.get(operation.getVisibility());
+		if (!papyrusOperation.getVisibility().equals(visibility)) {
+			createSetCommand(
+					new SetRequest(papyrusOperation, Literals.NAMED_ELEMENT__VISIBILITY, operation.getVisibility()),
+					papyrusOperation).execute();
+		}
+	}
+
+	private void destroyParameter(Parameter parameterToDestroy) {
+		DestroyElementRequest destroyRequest = new DestroyElementRequest(parameterToDestroy, false);
+		IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(parameterToDestroy);
+		ICommand destroyCommand = commandProvider.getEditCommand(destroyRequest);
+		new GMFtoEMFCommandWrapper(destroyCommand).execute();
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlPropertyToEditPart.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlPropertyToEditPart.java
new file mode 100644
index 0000000..e933e30
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/JsonUmlPropertyToEditPart.java
@@ -0,0 +1,312 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.js2java;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.Request;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.TypesFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlProperty;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.messages.Messages;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage.Literals;
+import org.eclipse.uml2.uml.VisibilityKind;
+
+/**
+ * Instance of this class is dedicated to the creation of commands for editing
+ * properties. It means
+ * <UL>
+ * <LI>creating an property</LI>
+ * <LI>updating an property</LI>
+ * <LI>deleting an property</LI>
+ * </UL>
+ *
+ */
+public class JsonUmlPropertyToEditPart {
+
+	private static final Activator LOGGER = Activator.getDefault();
+
+	TransactionalEditingDomain editingDomain;
+	ClassEditPart editPart;
+	ResizeableListCompartmentEditPart attributeCompartment;
+	JsonUmlProperty property;
+
+	/**
+	 * The constructor needs the editingDomain for the transaction, the class edit
+	 * part and property compartment edit part.
+	 *
+	 * @param editingDomain
+	 *            needed for the transaction
+	 * @param editPart
+	 *            needed for the creation of new property
+	 * @param attributeCompartment
+	 *            needed for the creation of new property
+	 */
+	public JsonUmlPropertyToEditPart(TransactionalEditingDomain editingDomain, ClassEditPart editPart,
+			ResizeableListCompartmentEditPart attributeCompartment) {
+		super();
+		this.editingDomain = editingDomain;
+		this.editPart = editPart;
+		this.attributeCompartment = attributeCompartment;
+	}
+
+	/**
+	 * This method creates a property (notation level) and returns the real property
+	 * (data level).
+	 *
+	 * @return the real uml property (data level)
+	 */
+	private Property createVisualProperty() {
+		try {
+			GraphicalEditPart parentEditPart = GraphicalEditPart.class.cast(editPart.getParent());
+
+			CreateViewRequest requestToCreateAVisualProperty = CreateViewRequestFactory.getCreateShapeRequest(
+					UMLElementTypes.Property_ClassAttributeLabel, parentEditPart.getDiagramPreferencesHint());
+			org.eclipse.gef.commands.Command commandToCreateAVisualProperty = attributeCompartment
+					.getCommand(requestToCreateAVisualProperty);
+			commandToCreateAVisualProperty.execute();
+			Collection<?> returnValues = DiagramCommandStack.getReturnValues(commandToCreateAVisualProperty);
+			for (Object returnValue : returnValues) {
+				if (returnValue instanceof CreateElementRequestAdapter) {
+					CreateElementRequestAdapter adapter = CreateElementRequestAdapter.class.cast(returnValue);
+					if (adapter.resolve() instanceof Property) {
+						return Property.class.cast(adapter.resolve());
+					}
+				}
+			}
+		} catch (Exception exception) {
+			LOGGER.logError(exception.toString(), exception);
+		}
+		return null;
+	}
+
+	/**
+	 * This method returns the command for creating a property based on a textual
+	 * definition (UmlProperty). The method just uses commandForUpdatingProperty but
+	 * with an empty property that it creates.
+	 *
+	 * @param property
+	 *            textual definition of the property
+	 * @return the creation command.
+	 */
+	protected Command commandForAddingProperty(JsonUmlProperty property) {
+		return commandForUpdatingProperty(property, null);
+	}
+
+	/**
+	 * This method returns the command for updating an existing property based on a
+	 * textual definition (UmlProperty).
+	 *
+	 * @param property
+	 *            textual definition of the property
+	 * @param papyrusProperty
+	 *            the existing and real property (data level).
+	 * @return the updating command
+	 */
+	protected Command commandForUpdatingProperty(JsonUmlProperty property, Property papyrusProperty) {
+
+		String commandLabel = (papyrusProperty == null ? Messages.JsonUmlPropertyToEditPart_Add_TitleCommand : Messages.JsonUmlPropertyToEditPart_Update_TitleCommand) + property.getName();
+		return new RecordingCommand(editingDomain, commandLabel) {
+			@Override
+			protected void doExecute() {
+
+				Property concretePapyrusProperty = papyrusProperty;
+
+				concretePapyrusProperty = createPropertyIfNull(concretePapyrusProperty);
+
+				processNameProperty(property, concretePapyrusProperty);
+				processTypeProperty(property, concretePapyrusProperty);
+				processVisibilityProperty(property, concretePapyrusProperty);
+				processDerivedProperty(property, concretePapyrusProperty);
+				processLowerProperty(property, concretePapyrusProperty);
+				processUpperProperty(property, concretePapyrusProperty);
+
+				/*
+				 * redefines : false, subsets : false
+				 */
+
+				processReadOnlyProperty(property, concretePapyrusProperty);
+				processOrderedProperty(property, concretePapyrusProperty);
+				processUniqueProperty(property, concretePapyrusProperty);
+
+				processDerivedUnionProperty(property, concretePapyrusProperty);
+
+				// Sequence - not found
+
+				processIDProperty(property, concretePapyrusProperty);
+
+				// Redefines - #TODO
+
+				// Subsets - #TODO
+
+			}
+
+		};
+
+	}
+
+	/**
+	 * This method is for constructing a command that removes a property (data
+	 * level) from a class
+	 *
+	 * @param propertyEditParts
+	 *            the list of properties of the class
+	 * @param papyrusProperty
+	 *            the real property
+	 * @return the removing command
+	 */
+	protected Command commandForRemovingProperty(Map<String, PropertyForClassEditPart> propertyEditParts,
+			Property papyrusProperty) {
+		return new RecordingCommand(editingDomain, Messages.JsonUmlPropertyToEditPart_Remove_TitleCommand + papyrusProperty.getName()) {
+			@Override
+			protected void doExecute() {
+				try {
+					PropertyForClassEditPart propertyEditPart = propertyEditParts.get(papyrusProperty.getName());
+
+					Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
+					org.eclipse.gef.commands.Command command2 = propertyEditPart.getCommand(deleteViewRequest);
+					propertyEditPart.getDiagramEditDomain().getDiagramCommandStack().execute(command2);
+
+				} catch (Exception ex) {
+					LOGGER.logError(ex.toString(), ex);
+				}
+			}
+		};
+	}
+
+	private Command createSetCommand(SetRequest setRequest, Property papyrusProperty) {
+		IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(papyrusProperty);
+		ICommand setCommand = commandProvider.getEditCommand(setRequest);
+		return new GMFtoEMFCommandWrapper(setCommand);
+	}
+
+	private Property createPropertyIfNull(Property papyrusProperty) {
+		if (papyrusProperty == null) {
+			papyrusProperty = createVisualProperty();
+		}
+		return papyrusProperty;
+	}
+
+	private void processNameProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (!papyrusProperty.getName().equals(property.getName())) {
+			createSetCommand(new SetRequest(papyrusProperty, Literals.NAMED_ELEMENT__NAME, property.getName()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processTypeProperty(JsonUmlProperty property, Property papyrusProperty) {
+		org.eclipse.uml2.uml.Type oldType = papyrusProperty.getType();
+		org.eclipse.uml2.uml.Type newType = TypesFactory.getInstance().createTypeHelper(papyrusProperty)
+				.getTypeFromName(property.getType());
+		if (oldType != newType) {
+			createSetCommand(new SetRequest(papyrusProperty, Literals.TYPED_ELEMENT__TYPE, newType), papyrusProperty)
+					.execute();
+		}
+	}
+
+	private void processVisibilityProperty(JsonUmlProperty property, Property papyrusProperty) {
+		VisibilityKind visibility = VisibilityKind.get(property.getVisibility());
+		if (!papyrusProperty.getVisibility().equals(visibility)) {
+			createSetCommand(
+					new SetRequest(papyrusProperty, Literals.NAMED_ELEMENT__VISIBILITY, property.getVisibility()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processDerivedProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (papyrusProperty.isDerived() != property.isDerived()) {
+			createSetCommand(new SetRequest(papyrusProperty, Literals.PROPERTY__IS_DERIVED, property.isDerived()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processLowerProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (papyrusProperty.getLower() != property.getLower()) {
+			createSetCommand(new SetRequest(papyrusProperty, Literals.MULTIPLICITY_ELEMENT__LOWER, property.getLower()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processUpperProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (papyrusProperty.getUpper() != property.getUpper()) {
+			createSetCommand(new SetRequest(papyrusProperty, Literals.MULTIPLICITY_ELEMENT__UPPER, property.getUpper()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processReadOnlyProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (papyrusProperty.isReadOnly() != property.isReadOnly()) {
+			createSetCommand(
+					new SetRequest(papyrusProperty, Literals.STRUCTURAL_FEATURE__IS_READ_ONLY, property.isReadOnly()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processOrderedProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (papyrusProperty.isOrdered() != property.isOrdered()) {
+			createSetCommand(
+					new SetRequest(papyrusProperty, Literals.MULTIPLICITY_ELEMENT__IS_ORDERED, property.isOrdered()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processUniqueProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (papyrusProperty.isUnique() != property.isUnique()) {
+			createSetCommand(
+					new SetRequest(papyrusProperty, Literals.MULTIPLICITY_ELEMENT__IS_UNIQUE, property.isUnique()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processDerivedUnionProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (papyrusProperty.isDerivedUnion() != property.isDerivedUnion()) {
+			createSetCommand(
+					new SetRequest(papyrusProperty, Literals.PROPERTY__IS_DERIVED_UNION, property.isDerivedUnion()),
+					papyrusProperty).execute();
+		}
+	}
+
+	private void processIDProperty(JsonUmlProperty property, Property papyrusProperty) {
+		if (papyrusProperty.isID() != property.isId()) {
+			createSetCommand(new SetRequest(papyrusProperty, Literals.PROPERTY__IS_ID, property.isId()),
+					papyrusProperty).execute();
+		}
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/ToEditPartFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/ToEditPartFactory.java
new file mode 100644
index 0000000..8176c9a
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/js2java/ToEditPartFactory.java
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.js2java;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.factory.BasicFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures.JsonUmlClass;
+//import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+public class ToEditPartFactory extends BasicFactory {
+
+	static ToEditPartFactory instance;
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 *
+	 * @return instance/factory
+	 */
+	public static ToEditPartFactory getInstance() {
+		if (instance == null) {
+			instance = new ToEditPartFactory();
+		}
+		return instance;
+	}
+
+	private ToEditPartFactory() {
+
+	}
+
+	public JsonUmlClassToEditPart createJsonUmlClassToEditPart(JsonUmlClass theClass, ClassEditPart editPart) {
+
+		Object[] arguments = { theClass, "theClass", editPart, "editPart" }; //$NON-NLS-1$ //$NON-NLS-2$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+
+		return new JsonUmlClassToEditPart(theClass, editPart);
+
+	}
+
+	public JsonUmlOperationToEditPart createJsonUmlOperationToEditPart(TransactionalEditingDomain editingDomain,
+			ClassEditPart editPart, ResizeableListCompartmentEditPart operationCompartment) {
+
+		Object[] arguments = { editingDomain, "editingDomain", editPart, "editPart", operationCompartment, //$NON-NLS-1$ //$NON-NLS-2$
+				"operationCompartment" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+
+		return new JsonUmlOperationToEditPart(editingDomain, editPart, operationCompartment);
+
+	}
+
+	public JsonUmlPropertyToEditPart createJsonUmlPropertyToEditPart(TransactionalEditingDomain editingDomain,
+			ClassEditPart editPart, ResizeableListCompartmentEditPart attributeCompartment) {
+
+		Object[] arguments = { editingDomain, "editingDomain", editPart, "editPart", attributeCompartment, //$NON-NLS-1$ //$NON-NLS-2$
+				"attributeCompartment" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+
+		return new JsonUmlPropertyToEditPart(editingDomain, editPart, attributeCompartment);
+
+	}
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonStructuresFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonStructuresFactory.java
new file mode 100644
index 0000000..7c6fcd6
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonStructuresFactory.java
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.factory.BasicFactory;
+
+public class JsonStructuresFactory extends BasicFactory {
+
+	private static JsonStructuresFactory instance;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private JsonStructuresFactory() {
+		// to prevent instantiation
+	}
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 *
+	 * @return instance/factory
+	 */
+	public static JsonStructuresFactory getInstance() {
+		if (instance == null) {
+			instance = new JsonStructuresFactory();
+		}
+		return instance;
+	}
+
+	public JsonUmlClass createJsonUmlClass() {
+		return new JsonUmlClass();
+	}
+
+	public JsonUmlOperation createJsonUmlOperation() {
+		return new JsonUmlOperation();
+	}
+
+	public JsonUmlOperationParameter createJsonUmlOperationParameter() {
+		return new JsonUmlOperationParameter();
+	}
+
+	public JsonUmlProperty createJsonUmlProperty() {
+		return new JsonUmlProperty();
+	}
+
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlClass.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlClass.java
new file mode 100644
index 0000000..7d233ee
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlClass.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class aims at defining a structure for Uml Classes for json messages
+ * exchanged during the mapping between Papyrus and the Javascript textual
+ * editor. The needed properties are a name, a list of properties and a list of
+ * operations.
+ */
+public class JsonUmlClass {
+
+	private String name;
+	private List<JsonUmlProperty> properties;
+	private List<JsonUmlOperation> operations;
+
+	JsonUmlClass() {
+		this.properties = new ArrayList<>();
+		this.operations = new ArrayList<>();
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public List<JsonUmlProperty> getProperties() {
+		return properties;
+	}
+
+	public void setProperties(List<JsonUmlProperty> properties) {
+		this.properties = properties;
+	}
+
+	public List<JsonUmlOperation> getOperations() {
+		return operations;
+	}
+
+	public void setOperations(List<JsonUmlOperation> operations) {
+		this.operations = operations;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlOperation.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlOperation.java
new file mode 100644
index 0000000..d9e9f8e
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlOperation.java
@@ -0,0 +1,117 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class aims at defining a structure for Uml Operation for json messages
+ * exchanged during the mapping between Papyrus and the Javascript textual
+ * editor. The needed properties are those of a Uml Operation: name, visibility,
+ * query, unique, ordered, sequence, redefines and a list of parameters.
+ */
+
+public class JsonUmlOperation {
+
+	private boolean query;
+	private boolean unique;
+	private boolean ordered;
+	private boolean sequence;
+	private boolean redefines;
+	private String redefinesProperty;
+	private String name;
+	private String visibility;
+	private List<JsonUmlOperationParameter> parameters;
+
+	JsonUmlOperation() {
+		this.parameters = new ArrayList<>();
+	}
+
+	public boolean isUnique() {
+		return unique;
+	}
+
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+	}
+
+	public boolean isOrdered() {
+		return ordered;
+	}
+
+	public void setOrdered(boolean ordered) {
+		this.ordered = ordered;
+	}
+
+	public boolean isSequence() {
+		return sequence;
+	}
+
+	public void setSequence(boolean sequence) {
+		this.sequence = sequence;
+	}
+
+	public boolean isRedefines() {
+		return redefines;
+	}
+
+	public void setRedefines(boolean redefines) {
+		this.redefines = redefines;
+	}
+
+	public String getRedefinesProperty() {
+		return redefinesProperty;
+	}
+
+	public void setRedefinesProperty(String redefinesProperty) {
+		this.redefinesProperty = redefinesProperty;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getVisibility() {
+		return visibility;
+	}
+
+	public void setVisibility(String visibility) {
+		this.visibility = visibility;
+	}
+
+	public boolean isQuery() {
+		return query;
+	}
+
+	public void setQuery(boolean query) {
+		this.query = query;
+	}
+
+	public List<JsonUmlOperationParameter> getParameters() {
+		return parameters;
+	}
+
+	public void setParameters(List<JsonUmlOperationParameter> parameters) {
+		this.parameters = parameters;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlOperationParameter.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlOperationParameter.java
new file mode 100644
index 0000000..5b7a89d
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlOperationParameter.java
@@ -0,0 +1,105 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures;
+
+/**
+ * This class aims at defining a structure for Uml Parameter for json messages
+ * exchanged during the mapping between Papyrus and the Javascript textual
+ * editor. The needed properties are those of a Uml Parameter: name, type,
+ * direction, unique, ordered and sequence.
+ */
+
+public class JsonUmlOperationParameter {
+
+	private boolean unique;
+	private boolean ordered;
+	private boolean sequence;
+	private String name;
+	private String type;
+	private int lower;
+	private int upper;
+	private String direction;
+
+	JsonUmlOperationParameter() {
+
+	}
+
+	public boolean isUnique() {
+		return unique;
+	}
+
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+	}
+
+	public boolean isOrdered() {
+		return ordered;
+	}
+
+	public void setOrdered(boolean ordered) {
+		this.ordered = ordered;
+	}
+
+	public boolean isSequence() {
+		return sequence;
+	}
+
+	public void setSequence(boolean sequence) {
+		this.sequence = sequence;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public int getLower() {
+		return lower;
+	}
+
+	public void setLower(int lower) {
+		this.lower = lower;
+	}
+
+	public int getUpper() {
+		return upper;
+	}
+
+	public void setUpper(int upper) {
+		this.upper = upper;
+	}
+
+	public String getDirection() {
+		return direction;
+	}
+
+	public void setDirection(String direction) {
+		this.direction = direction;
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlProperty.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlProperty.java
new file mode 100644
index 0000000..98358cd
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonUmlProperty.java
@@ -0,0 +1,180 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures;
+
+/**
+ * This class aims at defining a structure for Uml Property for json messages
+ * exchanged during the mapping between Papyrus and the Javascript textual
+ * editor. The needed properties are those of a Uml Property: name, type, lower,
+ * upper, visibility, derived, unique, ordered, sequence, readOnly,
+ * derivedUnion, id, subsets and redefines.
+ */
+
+public class JsonUmlProperty {
+
+	private boolean derived;
+	private boolean unique;
+	private boolean ordered;
+	private boolean readOnly;
+	private boolean derivedUnion;
+	private boolean sequence;
+	private boolean id;
+	private boolean subsets;
+	private boolean redefines;
+
+	private String subsetsProperty;
+	private String redefinesProperty;
+	private String name;
+	private String type;
+	private int lower;
+	private int upper;
+	private String visibility;
+
+	JsonUmlProperty() {
+
+	}
+
+	public boolean isDerived() {
+		return derived;
+	}
+
+	public void setDerived(boolean derived) {
+		this.derived = derived;
+	}
+
+	public boolean isUnique() {
+		return unique;
+	}
+
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+	}
+
+	public boolean isOrdered() {
+		return ordered;
+	}
+
+	public void setOrdered(boolean ordered) {
+		this.ordered = ordered;
+	}
+
+	public boolean isReadOnly() {
+		return readOnly;
+	}
+
+	public void setReadOnly(boolean readOnly) {
+		this.readOnly = readOnly;
+	}
+
+	public boolean isDerivedUnion() {
+		return derivedUnion;
+	}
+
+	public void setDerivedUnion(boolean derivedUnion) {
+		this.derivedUnion = derivedUnion;
+	}
+
+	public boolean isSequence() {
+		return sequence;
+	}
+
+	public void setSequence(boolean sequence) {
+		this.sequence = sequence;
+	}
+
+	public boolean isId() {
+		return id;
+	}
+
+	public void setId(boolean id) {
+		this.id = id;
+	}
+
+	public boolean isSubsets() {
+		return subsets;
+	}
+
+	public void setSubsets(boolean subsets) {
+		this.subsets = subsets;
+	}
+
+	public boolean isRedefines() {
+		return redefines;
+	}
+
+	public void setRedefines(boolean redefines) {
+		this.redefines = redefines;
+	}
+
+	public String getSubsetsProperty() {
+		return subsetsProperty;
+	}
+
+	public void setSubsetsProperty(String subsetsProperty) {
+		this.subsetsProperty = subsetsProperty;
+	}
+
+	public String getRedefinesProperty() {
+		return redefinesProperty;
+	}
+
+	public void setRedefinesProperty(String redefinesProperty) {
+		this.redefinesProperty = redefinesProperty;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public int getLower() {
+		return lower;
+	}
+
+	public void setLower(int lower) {
+		this.lower = lower;
+	}
+
+	public int getUpper() {
+		return upper;
+	}
+
+	public void setUpper(int upper) {
+		this.upper = upper;
+	}
+
+	public String getVisibility() {
+		return visibility;
+	}
+
+	public void setVisibility(String visibility) {
+		this.visibility = visibility;
+	}
+
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonVisibility.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonVisibility.java
new file mode 100644
index 0000000..b983ade
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/mapping/jsonstructures/JsonVisibility.java
@@ -0,0 +1,27 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.mapping.jsonstructures;
+
+/**
+ * This enumeration aims at defining an enumeration for visibility values for
+ * json messages exchanged during the mapping between Papyrus and the Javascript
+ * textual editor.
+ *
+ */
+public enum JsonVisibility {
+	PACKAGE, PUBLIC, PRIVATE, PROTECTED
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/messages/Messages.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/messages/Messages.java
new file mode 100644
index 0000000..8910cae
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/messages/Messages.java
@@ -0,0 +1,44 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.messages.messages"; //$NON-NLS-1$
+	public static String Activator_CannotBeCastedIn;
+	public static String Activator_InMethod;
+	public static String Activator_IsNullInMethod;
+	public static String Activator_Parameter;
+	public static String GetProperties_0;
+	public static String JsonUmlClassToEditPart_SetNameCommand_TitleCommand;
+	public static String JsonUmlClassToEditPart_TextualEditionOf_TitleCommand;
+	public static String JsonUmlOperationToEditPart_Add_TitleCommand;
+	public static String JsonUmlOperationToEditPart_Remove_TitleCommand;
+	public static String JsonUmlOperationToEditPart_Update_TitleCommand;
+	public static String JsonUmlPropertyToEditPart_Add_TitleCommand;
+	public static String JsonUmlPropertyToEditPart_Remove_TitleCommand;
+	public static String JsonUmlPropertyToEditPart_Update_TitleCommand;
+	public static String ObjectWithFunctions_JsonReadingProblem;
+	public static String UmlClassResizer_RESIZE;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/messages/messages.properties b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/messages/messages.properties
new file mode 100644
index 0000000..b33a585
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/messages/messages.properties
@@ -0,0 +1,15 @@
+Activator_CannotBeCastedIn=\ cannot be casted in 
+Activator_InMethod=\ in method 
+Activator_IsNullInMethod=\ is null in method 
+Activator_Parameter=Parameter 
+GetProperties_0=Problem of JSON reading
+JsonUmlClassToEditPart_SetNameCommand_TitleCommand=set Name
+JsonUmlClassToEditPart_TextualEditionOf_TitleCommand=Textual Edition of 
+JsonUmlOperationToEditPart_Add_TitleCommand=add 
+JsonUmlOperationToEditPart_Remove_TitleCommand=remove 
+JsonUmlOperationToEditPart_Update_TitleCommand=update 
+JsonUmlPropertyToEditPart_Add_TitleCommand=add 
+JsonUmlPropertyToEditPart_Remove_TitleCommand=remove 
+JsonUmlPropertyToEditPart_Update_TitleCommand=update 
+ObjectWithFunctions_JsonReadingProblem=Problem of JSON reading
+UmlClassResizer_RESIZE=Resize
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/swt/SwtFactory.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/swt/SwtFactory.java
new file mode 100644
index 0000000..9161749
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/swt/SwtFactory.java
@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.swt;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.factory.BasicFactory;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+
+public class SwtFactory extends BasicFactory {
+
+	static SwtFactory instance;
+
+	/**
+	 * This method returns the instance (singleton) to use as a factory.
+	 *
+	 * @return instance/factory
+	 */
+	public static SwtFactory getInstance() {
+		if (instance == null) {
+			instance = new SwtFactory();
+		}
+		return instance;
+	}
+
+	public UmlClassHTMLEditionDialog createUmlClassHTMLEditionDialog(ClassEditPart editPart) {
+		Object[] arguments = { editPart, "editPart" }; //$NON-NLS-1$
+		if (checkNullArgument(arguments)) {
+			return null;
+		}
+
+		return new UmlClassHTMLEditionDialog(editPart);
+	}
+
+	private SwtFactory() {
+
+	}
+
+}
\ No newline at end of file
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/swt/UmlClassHTMLEditionDialog.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/swt/UmlClassHTMLEditionDialog.java
new file mode 100644
index 0000000..5f2159b
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/swt/UmlClassHTMLEditionDialog.java
@@ -0,0 +1,218 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.swt;
+
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.javascript.functions.FunctionsFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.webpages.HtmlPage;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.webpages.ResourceAccessUtils;
+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassEditPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+
+import com.sun.javafx.webkit.WebConsoleListener;
+
+import javafx.embed.swt.FXCanvas;
+import javafx.scene.Scene;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import netscape.javascript.JSObject;
+
+/**
+ * This class aims at constructing the window that displays the editor. This
+ * class uses a browser widget that allows to load web pages: the editor is made
+ * with web technologies (html, css, javascript).
+ *
+ */
+public class UmlClassHTMLEditionDialog {
+
+	static final String PREFIX = "/html/umlclasseditor/"; //$NON-NLS-1$
+	static final String PREFIX_LIB = PREFIX + "lib/"; //$NON-NLS-1$
+	static final String PREFIX_LIB_SCRIPTS = PREFIX_LIB + "scripts/"; //$NON-NLS-1$
+	static final String PREFIX_LIB_STYLES = PREFIX_LIB + "styles/"; //$NON-NLS-1$
+	static final String PREFIX_SCRIPTS = PREFIX + "scripts/"; //$NON-NLS-1$
+	static final String PREFIX_STYLES = PREFIX + "styles/"; //$NON-NLS-1$
+
+	static final int EDITOR_WIDTH = 300;
+	static final int EDITOR_HEIGHT = 200;
+	static final int SPACE_BETWEEN_CLASS_AND_EDITOR = 5;
+	private ClassEditPart editPart;
+	private Shell shell;
+	static final String[] cssFiles = { PREFIX_LIB_STYLES + "docs.css", PREFIX_LIB_STYLES + "codemirror.css", //$NON-NLS-1$ //$NON-NLS-2$
+			PREFIX_LIB_STYLES + "show-hint.css", PREFIX_STYLES + "uml.css" }; //$NON-NLS-1$ //$NON-NLS-2$
+	static final String[] scripts = { PREFIX_LIB_SCRIPTS + "codemirror.js", PREFIX_LIB_SCRIPTS + "show-hint.js", //$NON-NLS-1$ //$NON-NLS-2$
+			PREFIX_SCRIPTS + "utils.js", PREFIX_SCRIPTS + "logFunction.js", PREFIX_SCRIPTS + "javaProxy.js", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			PREFIX_SCRIPTS + "readingTokens.js", PREFIX_SCRIPTS + "statesTypesAndLabels.js", //$NON-NLS-1$ //$NON-NLS-2$
+			PREFIX_SCRIPTS + "autoComplete.js", PREFIX_SCRIPTS + "errorManagment.js", //$NON-NLS-1$ //$NON-NLS-2$
+			PREFIX_SCRIPTS + "editorStateMachine.js", PREFIX_SCRIPTS + "propertyManagment.js" }; //$NON-NLS-1$ //$NON-NLS-2$
+
+	private static final Activator LOGGER = Activator.getDefault();
+	
+	private WebView browser;
+	private WebEngine engine;
+	private FXCanvas fxCanvas;
+
+	/**
+	 * The constructor takes a class (edit part) on which the editor will be based.
+	 * The constructor also launches the initialization of the component (and so the
+	 * whole display).
+	 *
+	 * @param editPart
+	 *            the class (edit part)
+	 */
+	UmlClassHTMLEditionDialog(ClassEditPart editPart) {
+		this.editPart = editPart;
+		init();
+	}
+
+	/**
+	 * The initialization of the component (and so the whole display): it constructs
+	 * the dialog box, load the whole web page and show the dialog box.
+	 */
+	private void init() {
+
+		constructDialog();
+		constructBrowserInDialog();
+		showDialog();
+		fxCanvas.setFocus();
+		browser.requestFocus();
+
+	}
+
+	/**
+	 * Display the dialog box and makes the focus on it.
+	 */
+	private void showDialog() {
+		shell.open();
+		shell.forceFocus();
+	}
+
+	/**
+	 * Constructs the browser component, load the html page, all the Java-Javascript
+	 * functions and the key listener (ESC to escape without validate).
+	 */
+	private void constructBrowserInDialog() {
+		fxCanvas = new FXCanvas(shell, SWT.NONE);
+		shell.setLayout(new FillLayout());
+		browser = new WebView();
+		engine = browser.getEngine();
+		engine.setJavaScriptEnabled(true);
+		Scene scene = new Scene(browser);
+		fxCanvas.setScene(scene);
+
+		redirectConsoleLog();
+
+		initJSObjectProxy();
+
+		loadHtmlPage();
+
+		addKeyListenerForBrowser();
+
+	}
+
+	protected void initJSObjectProxy() {
+		JSObject window = (JSObject) engine.executeScript("window"); //$NON-NLS-1$
+		window.setMember("javaTextualEditor", FunctionsFactory.getInstance().createObjectWithFunctions(this, editPart)); //$NON-NLS-1$
+	}
+
+	protected void redirectConsoleLog() {
+		WebConsoleListener.setDefaultListener((webView, message, lineNumber, sourceId) -> {
+			LOGGER.logInfo(message + "[at " + lineNumber + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+		});
+	}
+
+	/**
+	 * Loads the html page: load all the css, javascripts and html pages that
+	 * compose the editor. For this, it uses functions from
+	 * {@link org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.webpages.HtmlPage}.
+	 */
+	private void loadHtmlPage() {
+
+		ResourceAccessUtils.getInstance().getContentOfFileLocatedInTheJar(PREFIX + "body.html"); //$NON-NLS-1$
+		engine.loadContent(HtmlPage.getInstance().createHtmlContentFromHeadScriptBody(PREFIX + "head.html", cssFiles, scripts, //$NON-NLS-1$
+				PREFIX + "body.html")); //$NON-NLS-1$
+	}
+
+	/**
+	 * Adds the ESC pressed listener.
+	 */
+	private void addKeyListenerForBrowser() {
+		browser.setOnKeyPressed((KeyEvent event) -> {
+			if (event.getCode() == KeyCode.ESCAPE) {
+				close();
+			}
+		});
+	}
+
+	/**
+	 * Constructs the dialog box (and set corresponding bounds
+	 */
+	private void constructDialog() {
+		Rectangle epBound = editPart.getFigure().getBounds().getCopy();
+		editPart.getFigure().translateToAbsolute(epBound);
+
+		Point absoluteLocationOfUmlClass = editPart.getViewer().getControl().toDisplay(epBound.getTopRight().x, epBound.getTopRight().y);
+		shell = new Shell(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.APPLICATION_MODAL);
+		shell.setLayout(new FillLayout());
+		shell.setBounds(absoluteLocationOfUmlClass.x + SPACE_BETWEEN_CLASS_AND_EDITOR,
+				absoluteLocationOfUmlClass.y, EDITOR_WIDTH, EDITOR_HEIGHT);
+
+	}
+
+	protected Rectangle getEditPartBounds() {
+		Rectangle bounds = editPart.getFigure().getBounds().getCopy();
+
+		// computer translation according to possible containers
+
+		EditPart parent = editPart.getParent();
+		while (parent != null) {
+			if (parent instanceof CompartmentEditPart) {
+				CompartmentEditPart compartment = CompartmentEditPart.class.cast(parent);
+				Rectangle compartmentBounds = compartment.getFigure().getBounds();
+				bounds.x += compartmentBounds.x;
+				bounds.y += compartmentBounds.y;
+			}
+			parent = parent.getParent();
+		}
+
+		return bounds;
+	}
+
+	/**
+	 * This method is called by the javascript function closeAndPerform (just to
+	 * close the dialog box).
+	 */
+	public void closeAndPerform() {
+		close();
+	}
+
+	/**
+	 * Closes the dialog box
+	 */
+	protected void close() {
+		shell.dispose();
+	}
+
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/webpages/HtmlPage.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/webpages/HtmlPage.java
new file mode 100644
index 0000000..bfc80b8
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/webpages/HtmlPage.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.webpages;
+
+/**
+ * This class is dedicated to load a web page and replacing the loading
+ * mechanisms of a web page by those of {@link ResourceAccessUtils} class.
+ *
+ */
+public class HtmlPage {
+
+	private static HtmlPage instance;
+
+	private HtmlPage() {
+		// to prevent instantiation
+	}
+
+	public static HtmlPage getInstance() {
+		if (instance == null) {
+			instance = new HtmlPage();
+		}
+		return instance;
+
+	}
+
+	/**
+	 * This static method is used to load a head html file, a list of css files, a
+	 * list of (java)scripts and a body html file. The loading mechanisms of a web
+	 * page (like script tag) are not possible when dealing with a jar.
+	 * 
+	 * @param headFileName
+	 *            head html file
+	 * @param cssFileNames
+	 *            a list of css files
+	 * @param scriptsFileNames
+	 *            a list of (java)scripts
+	 * @param bodyFileName
+	 *            a body html file
+	 * @return the html string/page
+	 */
+	public String createHtmlContentFromHeadScriptBody(String headFileName, String[] cssFileNames,
+			String[] scriptsFileNames, String bodyFileName) {
+
+		String htmlContent = ""; //$NON-NLS-1$
+		htmlContent += ResourceAccessUtils.getInstance().getContentOfFileLocatedInTheJar(headFileName);
+
+		for (String cssFileName : cssFileNames)
+			htmlContent += "<style>" + ResourceAccessUtils.getInstance().getContentOfFileLocatedInTheJar(cssFileName) + "</style>"; //$NON-NLS-1$ //$NON-NLS-2$
+
+		for (String scriptFileName : scriptsFileNames)
+			htmlContent += "<script>" + ResourceAccessUtils.getInstance().getContentOfFileLocatedInTheJar(scriptFileName) + "</script>"; //$NON-NLS-1$ //$NON-NLS-2$
+		htmlContent += ResourceAccessUtils.getInstance().getContentOfFileLocatedInTheJar(bodyFileName);
+		return htmlContent;
+	}
+}
diff --git a/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/webpages/ResourceAccessUtils.java b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/webpages/ResourceAccessUtils.java
new file mode 100644
index 0000000..343577b
--- /dev/null
+++ b/lookAndFeel/plugins/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/webpages/ResourceAccessUtils.java
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Xavier Le Pallec (for CEA LIST) xlepallec@lilo.org - Bug 558456
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.webpages;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.Activator;
+
+/**
+ * This class is just used to load files in the plug-in jar file. See the getContentOfFileLocatedInTheJar method.
+ *
+ */
+public class ResourceAccessUtils {
+
+	private static final Activator LOGGER = Activator.getDefault();
+	private static ResourceAccessUtils instance;
+
+	private ResourceAccessUtils() {
+		// to prevent instatiation
+	}
+
+	public static ResourceAccessUtils getInstance() {
+		if (instance == null) {
+			instance = new ResourceAccessUtils();
+		}
+		return instance;
+	}
+
+	/**
+	 * This methods loads a file in a the plug-in jar file.
+	 *
+	 * @param nameFile
+	 *            the full name of the file.
+	 * @return the content of the file.
+	 */
+	public String getContentOfFileLocatedInTheJar(String nameFile) {
+		InputStream in = ResourceAccessUtils.class.getResourceAsStream(nameFile);
+		BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+		StringBuilder fileContent = new StringBuilder(""); //$NON-NLS-1$
+		try {
+			String currentLine = reader.readLine();
+			while (currentLine != null) {
+				fileContent.append(currentLine + "\n"); //$NON-NLS-1$
+				currentLine = reader.readLine();
+			}
+			reader.close();
+			in.close();
+		} catch (IOException exception) {
+			LOGGER.logError(exception.toString(), exception);
+		}
+		return fileContent.toString();
+	}
+
+}
diff --git a/lookAndFeel/plugins/pom.xml b/lookAndFeel/plugins/pom.xml
new file mode 100755
index 0000000..a17fd63
--- /dev/null
+++ b/lookAndFeel/plugins/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.lf.releng</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<relativePath>../../../../../releng/lf/pom.xml</relativePath>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.diagram.clazz-lf</artifactId>
+	<packaging>pom</packaging>
+	<description>This folder contains code concerning the look and feel of the UML Class Diagram</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition</module>
+	</modules>
+</project>
\ No newline at end of file
diff --git a/lookAndFeel/releng/pom.xml b/lookAndFeel/releng/pom.xml
new file mode 100755
index 0000000..3b8f1c1
--- /dev/null
+++ b/lookAndFeel/releng/pom.xml
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.all.releng</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.lf.releng</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<properties>
+		<target.platform>org.eclipse.papyrus.lf.${target.suffix}.targetplatform</target.platform>
+		<efx-version>1.2.0</efx-version>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>efxclipse-repo</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/efxclipse/runtime-latest/site</url>
+		</repository>
+
+	</repositories>
+
+	<modules>
+		<module>../../features/papyrus-lf-features</module>
+		<module>../../plugins/uml/diagram/clazz/lf</module>
+		<module>site</module>
+		<module>targetPlatform</module>
+	</modules>
+
+	<build>
+		<plugins>
+			<!-- local plugins -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<source>1.8</source>
+					<target>1.8</target>
+					<extraClasspathElements>
+						<extraClasspathElement>
+							<groupId>com.oracle</groupId>
+							<artifactId>javafx</artifactId>
+							<version>2.2.0-SNAPSHOT</version>
+							<systemPath>${java.home}/lib/jfxrt.jar</systemPath>
+							<scope>system</scope>
+						</extraClasspathElement>
+						<extraClasspathElement>
+							<groupId>com.oracle</groupId>
+							<artifactId>javafxswt</artifactId>
+							<version>2.2.0-SNAPSHOT</version>
+							<systemPath>${java.home}/lib/jfxswt.jar</systemPath>
+							<scope>system</scope>
+						</extraClasspathElement>
+					</extraClasspathElements>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+			</plugin>
+
+			<!-- Sources -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tychoExtrasVersion}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Pack200 -->
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-pack200b-plugin</artifactId>
+				<version>${tychoExtrasVersion}</version>
+				<executions>
+					<execution>
+						<id>pack200-pack</id>
+						<goals>
+							<goal>pack</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<defaultP2Metadata>false</defaultP2Metadata>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>defaultProfile</id>
+			<repositories>
+				<repository>
+					<id>papyrus-main</id>
+					<layout>p2</layout>
+					<url>${papyrus.repo.main}</url>
+				</repository>
+			</repositories>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+
+		<profile>
+			<id>buildAll</id>
+			<!-- Papyrus Update sites not included (They are included in the same 
+				build) -->
+			<activation>
+				<property>
+					<name>buildAll</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<!-- Stable release profile. Takes +30min. Eclipse servers only -->
+		<profile>
+			<id>packAndSign</id>
+			<!-- Pack200 -->
+			<activation>
+				<property>
+					<name>SIGN</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200a-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-normalize</id>
+								<goals>
+									<goal>normalize</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.cbi.maven.plugins</groupId>
+						<artifactId>eclipse-jarsigner-plugin</artifactId>
+						<version>${jarSignerVersion}</version>
+						<executions>
+							<execution>
+								<id>sign</id>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-pack</id>
+								<goals>
+									<goal>pack</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<defaultP2Metadata>false</defaultP2Metadata>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+
+		<!-- Nightly profile. Artifacts can be consumed, but are not signed -->
+		<profile>
+			<id>pack</id>
+			<activation>
+				<property>
+					<name>SIGN</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<!-- Pack200 -->
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-pack</id>
+								<goals>
+									<goal>pack</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<defaultP2Metadata>false</defaultP2Metadata>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+
+		<!-- Analysis profile. Takes +1h -->
+		<profile>
+			<id>findBugs</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>findbugs-maven-plugin</artifactId>
+						<version>${findbugs.version}</version>
+						<configuration>
+							<findbugsXmlOutput>true</findbugsXmlOutput>
+							<failOnError>false</failOnError>
+							<maxHeap>1024</maxHeap>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/lookAndFeel/releng/site/category.xml b/lookAndFeel/releng/site/category.xml
new file mode 100755
index 0000000..c779b3c
--- /dev/null
+++ b/lookAndFeel/releng/site/category.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="org.eclipse.papyrus.uml.diagram.clazz.lf.feature">
+      <category name="org.eclipse.papyrus.look.and.feel.category"/>
+   </feature>
+   <category-def name="org.eclipse.papyrus.look.and.feel.category" label="Papyrus Look And Feel">
+      <description>
+         Papyrus Look And Feel provides tools to improve the user experience with Papyrus.
+      </description>
+   </category-def>
+</site>
diff --git a/lookAndFeel/releng/site/pom.xml b/lookAndFeel/releng/site/pom.xml
new file mode 100755
index 0000000..8947309
--- /dev/null
+++ b/lookAndFeel/releng/site/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>org.eclipse.papyrus.lf.releng</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.p2.lf</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-repository</packaging>
+
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>org.jboss.tools.tycho-plugins</id>
+			<url>https://repository.jboss.org/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<includePackedArtifacts>true</includePackedArtifacts>
+				</configuration>
+			</plugin>
+
+			<!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
+			<plugin>
+				<groupId>org.jboss.tools.tycho-plugins</groupId>
+				<artifactId>repository-utils</artifactId>
+				<version>${jboss.utils.version}</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>generate-repository-facade</goal>
+						</goals>
+						<configuration>
+							<!-- do not generate the pesky web folder and index.html -->
+							<skipWebContentGeneration>true</skipWebContentGeneration>
+							<!-- p2 update site transitive dependencies repositories -->
+							<associateSites>
+								<!-- javaFX --> 
+								<site>https://download.eclipse.org/efxclipse/runtime-released/3.6.2/site</site>
+							</associateSites>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/lookAndFeel/releng/targetPlatform/eclipse/org.eclipse.papyrus.lf.eclipse.targetplatform.target b/lookAndFeel/releng/targetPlatform/eclipse/org.eclipse.papyrus.lf.eclipse.targetplatform.target
new file mode 100755
index 0000000..da57fee
--- /dev/null
+++ b/lookAndFeel/releng/targetPlatform/eclipse/org.eclipse.papyrus.lf.eclipse.targetplatform.target
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Papyrus LF" sequenceNumber="1589273005">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
+      <unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201703081533"/>
+      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/releases/1.5.0/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+      <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>
+      <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+      <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
+      <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+      <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/>
+      <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
+      <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
+      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/milestones-1.4.100/1.4.100-RC1/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191209-1226"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.10.1"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
+      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/>
+      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.1.v20200302-1312"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="4.15.0.v20200305-0155"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.15/R-4.15-202003050155/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.11.0.v20200309-0848"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.11.0.v20200309-0848"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/releases/6.11.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.21.0.v20200302-1509"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.21.0.v20200302-1509"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.21.0.v20200302-1509"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.21.0.v20200302-1509"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.21.0.v20200302-1509"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.21.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.2.v20200224-0816"/>
+      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.2/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.17.0/R-3.17.0-20200306035042/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.2.201912020813"/>
+      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201912020813"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/>
+      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.21.0.v20200205-0529"/>
+      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/release/2.21"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
+      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.1.201812070911"/>
+      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/releases/R201812070911"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/>
+      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
+      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.9.v20190906-1522"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.9.v20190906-1522"/>
+      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.93.v20190906-1522"/>
+      <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
+      <repository id="orbit2020" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="3.6.2.202001141050"/>
+      <repository id="javaFX" location="file:/home/data/httpd/download.eclipse.org/efxclipse/runtime-released/3.6.2/site"/>
+    </location>
+  </locations>
+</target>
diff --git a/lookAndFeel/releng/targetPlatform/eclipse/pom.xml b/lookAndFeel/releng/targetPlatform/eclipse/pom.xml
new file mode 100755
index 0000000..49a7b23
--- /dev/null
+++ b/lookAndFeel/releng/targetPlatform/eclipse/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>org.eclipse.papyrus.lf.targetplatform.parent</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.lf.eclipse.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+</project>
diff --git a/lookAndFeel/releng/targetPlatform/pom.xml b/lookAndFeel/releng/targetPlatform/pom.xml
new file mode 100755
index 0000000..999c56a
--- /dev/null
+++ b/lookAndFeel/releng/targetPlatform/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>org.eclipse.papyrus.lf.releng</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.lf.targetplatform.parent</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<profiles>
+		<profile>
+			<id>portable</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<modules>
+				<module>portable</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>eclipse</id>
+			<activation>
+				<property>
+					<name>target.suffix</name>
+					<value>eclipse</value>
+				</property>
+			</activation>
+			<modules>
+				<module>eclipse</module>
+			</modules>
+		</profile>
+	</profiles>
+</project>
+
diff --git a/lookAndFeel/releng/targetPlatform/portable/org.eclipse.papyrus.lf.portable.targetplatform.target b/lookAndFeel/releng/targetPlatform/portable/org.eclipse.papyrus.lf.portable.targetplatform.target
new file mode 100755
index 0000000..a3e9e64
--- /dev/null
+++ b/lookAndFeel/releng/targetPlatform/portable/org.eclipse.papyrus.lf.portable.targetplatform.target
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Papyrus LF" sequenceNumber="1589273005">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
+      <unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201703081533"/>
+      <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.2.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+      <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+      <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>
+      <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+      <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
+      <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+      <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/>
+      <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
+      <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
+      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
+      <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.4.100/1.4.100-RC1/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191209-1226"/>
+      <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.1"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
+      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/>
+      <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.1.v20200302-1312"/>
+      <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="4.15.0.v20200305-0155"/>
+      <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.15/R-4.15-202003050155/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.11.0.v20200309-0848"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.11.0.v20200309-0848"/>
+      <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.11.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.21.0.v20200302-1509"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.21.0.v20200302-1509"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.21.0.v20200302-1509"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="2.21.0.v20200302-1509"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="2.21.0.v20200302-1509"/>
+      <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.21.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.2.v20200224-0816"/>
+      <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.2/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+      <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.17.0/R-3.17.0-20200306035042/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.2.201912020813"/>
+      <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201912020813"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/>
+      <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.21.0.v20200205-0529"/>
+      <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.21"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
+      <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.1.201812070911"/>
+      <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R201812070911"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/>
+      <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
+      <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.9.v20190906-1522"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.9.v20190906-1522"/>
+      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.93.v20190906-1522"/>
+      <unit id="org.mockito" version="2.23.0.v20190527-1420"/>
+      <repository id="orbit2020" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="3.6.2.202001141050"/>
+      <repository id="javaFX" location="https://download.eclipse.org/efxclipse/runtime-released/3.6.2/site"/>
+    </location>
+  </locations>
+</target>
diff --git a/lookAndFeel/releng/targetPlatform/portable/org.eclipse.papyrus.lf.portable.targetplatform.tpd b/lookAndFeel/releng/targetPlatform/portable/org.eclipse.papyrus.lf.portable.targetplatform.tpd
new file mode 100755
index 0000000..09595f1
--- /dev/null
+++ b/lookAndFeel/releng/targetPlatform/portable/org.eclipse.papyrus.lf.portable.targetplatform.tpd
@@ -0,0 +1,16 @@
+target "Papyrus LF" with requirements source
+
+include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd"
+
+
+/*** Manual referencing ***/
+location orbit2020 "https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository/" {
+	com.fasterxml.jackson.core.jackson-annotations [2.9.9,3.0.0) 
+	com.fasterxml.jackson.core.jackson-core [2.9.9,3.0.0)
+ 	com.fasterxml.jackson.core.jackson-databind [2.9.93,3.0.0)
+ 	org.mockito [2.23.0,3.0.0)
+}
+
+location javaFX "https://download.eclipse.org/efxclipse/runtime-released/3.6.2/site"{
+	org.eclipse.fx.runtime.min.feature.feature.group [3.6.0,4.0.0)
+}
\ No newline at end of file
diff --git a/lookAndFeel/releng/targetPlatform/portable/pom.xml b/lookAndFeel/releng/targetPlatform/portable/pom.xml
new file mode 100755
index 0000000..d7fa24b
--- /dev/null
+++ b/lookAndFeel/releng/targetPlatform/portable/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>org.eclipse.papyrus.lf.targetplatform.parent</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.lf.portable.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+</project>
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.classpath b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.classpath
new file mode 100644
index 0000000..dcb6fb3
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.project b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.project
new file mode 100644
index 0000000..c7cadfb
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..dbda3b2
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=10
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/META-INF/MANIFEST.MF b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..09ab215
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.mockito;bundle-version="2.23.0",
+ org.eclipse.draw2d,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="3.4.0",
+ org.eclipse.papyrus.uml.diagram.clazz,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout,
+ org.junit.jupiter.api
+Bundle-RequiredExecutionEnvironment: JavaSE-10
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests
+Bundle-ActivationPolicy: lazy
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/build.properties b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/Activator.java b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/Activator.java
new file mode 100644
index 0000000..ffd019d
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/Activator.java
@@ -0,0 +1,22 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/edit/parts/MyAssociationEndSourceEditPartTest.java b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/edit/parts/MyAssociationEndSourceEditPartTest.java
new file mode 100644
index 0000000..0562807
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/edit/parts/MyAssociationEndSourceEditPartTest.java
@@ -0,0 +1,24 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests.edit.parts;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class MyAssociationEndSourceEditPartTest {
+
+	@BeforeEach
+	void setUp() throws Exception {
+	}
+
+	@AfterEach
+	void tearDown() throws Exception {
+	}
+
+	@Test
+	void testCalculateLength() {
+		fail("Not yet implemented");
+	}
+
+}
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/locators/source/AssociatedSegmentTest.java b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/locators/source/AssociatedSegmentTest.java
new file mode 100644
index 0000000..61ec3d8
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/associationlabellayout/tests/locators/source/AssociatedSegmentTest.java
@@ -0,0 +1,96 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.tests.locators.source;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source.AssociatedSourceSegment;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.associationlabellayout.locators.source.SourceLocatorFactory;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.eclipse.draw2d.geometry.Point;
+
+class AssociatedSegmentTest {
+
+	private AssociatedSourceSegment associatedSegment;
+	private IFigure iFigure;
+	private AssociationEditPart associationEditPart;
+	
+	@BeforeEach
+	void setUp() throws Exception {
+		associationEditPart = Mockito.mock(AssociationEditPart.class);
+		iFigure = Mockito.mock(IFigure.class);
+		associatedSegment = SourceLocatorFactory.getInstance().createAssociatedSourceSegment(iFigure, associationEditPart);
+	}
+
+	@AfterEach
+	void tearDown() throws Exception {
+	}
+
+	@Test
+	void testGetStartingPoint() {
+		Connection parent = Mockito.mock(Connection.class);
+		PointList pointList = Mockito.mock(PointList.class);
+		Mockito.when(parent.getPoints()).thenReturn(pointList);
+		Mockito.when(pointList.toIntArray()).thenReturn(new int[] {1,2,3,4});
+		Mockito.when(iFigure.getParent()).thenReturn(parent);
+		
+		Point point = associatedSegment.getStartingPoint();
+		
+		// access rules to junit to edit
+		//assertEquals(point.x, 3);
+		//assertEquals(point.y, 4);
+
+	}
+
+	@Test
+	void testGetEndPoint() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	void testGetConnectedClass() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	void testAssociatedSegment() {
+		fail("Not yet implemented"); 
+	}
+
+	@Test
+	void testAbstractAssociatedSegment() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	void testGetGradient() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	void testGetYIntercept() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	void testGetAngle() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	void testDoesSegmentPointToBack() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	void testGetThePointDistantOf() {
+		fail("Not yet implemented");
+	}
+
+}
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.classpath b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.classpath
new file mode 100644
index 0000000..3e5654f
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.project b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.project
new file mode 100644
index 0000000..152be42
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/META-INF/MANIFEST.MF b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..39bb992
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.diagram.clazz,
+ org.eclipse.papyrus.infra.gmfdiag.css,
+ org.mockito,
+ org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="3.4.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests
+Bundle-ActivationPolicy: lazy
+Import-Package: org.junit.jupiter.api
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/build.properties b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/Activator.java b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/Activator.java
new file mode 100644
index 0000000..c4e5360
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/Activator.java
@@ -0,0 +1,22 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/providers/ProviderToOverrideMouseMoveDuringCreation.java b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/providers/ProviderToOverrideMouseMoveDuringCreation.java
new file mode 100644
index 0000000..8d0734a
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/providers/ProviderToOverrideMouseMoveDuringCreation.java
@@ -0,0 +1,336 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests.edit.policies.providers;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.router.LinkLFDiagramRootEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.EditPolicyFactory;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.NotAClassEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.NotHideableClassElementEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.HideableClassElementEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.ContainerEditPolicy;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+class ProviderToOverrideMouseMoveDuringCreation {
+
+	Mockito mock;
+	SubProvider providerToTest;
+	EditPart rootEditPart;
+	ModelEditPart modelEditPart;
+	CSSDiagramImpl cssDiagramImpl;
+
+	CreateEditPoliciesOperation createEditPoliciesOperation;
+
+	ClassAttributeCompartmentEditPart anAttributeCompartmentEditPart;
+	ClassOperationCompartmentEditPart anOperationCompartmentEditPart;
+	OperationForClassEditPart anOperationForClassEditPart;
+	ClassNestedClassifierCompartmentEditPart nestedClassifierCompartmentEditPart;
+	ClassEditPart classEditPart;
+	ClassNameEditPart classNameEditPart;
+	ClassFloatingNameEditPart classFloatingNameEditPart;
+
+	@BeforeEach
+	void setUp() throws Exception {
+
+		this.providerToTest = new SubProvider();
+		providerToTest.initFakePoliciesFactory();
+
+		rootEditPart = (EditPart) Mockito.mock(LinkLFDiagramRootEditPart.class);
+
+		modelEditPart = Mockito.mock(ModelEditPart.class);
+		cssDiagramImpl = Mockito.mock(CSSDiagramImpl.class);
+		Mockito.when(modelEditPart.getModel()).thenReturn(cssDiagramImpl);
+		Mockito.when(cssDiagramImpl.getType()).thenReturn("PapyrusUMLClassDiagram");
+		createEditPoliciesOperation = Mockito.mock(CreateEditPoliciesOperation.class);
+		anAttributeCompartmentEditPart = Mockito.mock(ClassAttributeCompartmentEditPart.class);
+		anOperationCompartmentEditPart = Mockito.mock(ClassOperationCompartmentEditPart.class);
+		anOperationForClassEditPart = Mockito.mock(OperationForClassEditPart.class);
+		nestedClassifierCompartmentEditPart = Mockito.mock(ClassNestedClassifierCompartmentEditPart.class);
+		classEditPart = Mockito.mock(ClassEditPart.class);
+		classNameEditPart = Mockito.mock(ClassNameEditPart.class);
+		classFloatingNameEditPart = Mockito.mock(ClassFloatingNameEditPart.class);
+
+	}
+
+	@AfterEach
+	void tearDown() throws Exception {
+	}
+
+	@Test
+	void testProvides() {
+		// As doesTheEditPartInTheOperationConcernAClassDiagramElement cannot be
+		// tested...
+		assertEquals(true, true);
+	}
+
+	public class MyAnswer<T> implements Answer<T> {
+
+		String labelPolicy;
+		CreationEditPolicy editPolicy;
+
+		public MyAnswer(String labelPolicy, CreationEditPolicy editPolicy) {
+			super();
+			this.labelPolicy = labelPolicy;
+			this.editPolicy = editPolicy;
+		}
+
+		@Override
+		public T answer(InvocationOnMock invocation) throws Throwable {
+			Object[] args = invocation.getArguments();
+			assertEquals(args[0], labelPolicy);
+			assertEquals(args[1], editPolicy);
+			return null;
+		}
+
+	}
+
+	@Test
+	void testCreateEditPolicies() {
+
+		final String POLICY_LABEL = org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.providers.MouseCreationEditPolicyProvider.POLICY_LABEL_TO_OVERRIDE;
+
+		Mockito.doAnswer(new MyAnswer<Void>(POLICY_LABEL, providerToTest.policyForUmlClassComponentPotentiallyHideable))
+				.when(anAttributeCompartmentEditPart).installEditPolicy(Mockito.anyObject(), Mockito.anyObject());
+		providerToTest.createEditPolicies(anAttributeCompartmentEditPart);
+
+		Mockito.doAnswer(new MyAnswer<Void>(POLICY_LABEL, providerToTest.policyForUmlClassComponentPotentiallyHideable))
+				.when(anOperationCompartmentEditPart).installEditPolicy(Mockito.anyObject(), Mockito.anyObject());
+		providerToTest.createEditPolicies(anOperationCompartmentEditPart);
+
+		
+		Mockito.doAnswer(new MyAnswer<Void>(POLICY_LABEL, providerToTest.policyForUmlClassComponentPotentiallyHideable))
+				.when(anOperationForClassEditPart).installEditPolicy(Mockito.anyObject(), Mockito.anyObject());
+		providerToTest.createEditPolicies(anOperationForClassEditPart);
+
+		Mockito.doAnswer(new MyAnswer<Void>(POLICY_LABEL, providerToTest.policyForUmlClassComponentPotentiallyHideable))
+				.when(nestedClassifierCompartmentEditPart).installEditPolicy(Mockito.anyObject(), Mockito.anyObject());
+		providerToTest.createEditPolicies(nestedClassifierCompartmentEditPart);
+
+		Mockito.doAnswer(new MyAnswer<Void>(POLICY_LABEL, providerToTest.policyForUmlClassComponentNotHideable))
+				.when(classEditPart).installEditPolicy(Mockito.anyObject(), Mockito.anyObject());
+		providerToTest.createEditPolicies(classEditPart);
+
+		Mockito.doAnswer(new MyAnswer<Void>(POLICY_LABEL, providerToTest.policyForUmlClassComponentNotHideable))
+				.when(classNameEditPart).installEditPolicy(Mockito.anyObject(), Mockito.anyObject());
+		providerToTest.createEditPolicies(classNameEditPart);
+
+		Mockito.doAnswer(new MyAnswer<Void>(POLICY_LABEL, providerToTest.policyForUmlClassComponentNotHideable))
+				.when(classFloatingNameEditPart).installEditPolicy(Mockito.anyObject(), Mockito.anyObject());
+		providerToTest.createEditPolicies(classFloatingNameEditPart);
+
+		Mockito.doAnswer(new MyAnswer<Void>(POLICY_LABEL, providerToTest.policyForUmlClassDiagram)).when(modelEditPart)
+				.installEditPolicy(Mockito.anyObject(), Mockito.anyObject());
+		providerToTest.createEditPolicies(modelEditPart);
+
+	}
+
+	@Test
+	void testIsAnEditPolicyForCreationThatHasBeenAsked() {
+		assertEquals(providerToTest.isAnEditPolicyForCreationThatHasBeenAsked(createEditPoliciesOperation), true);
+	}
+
+	@Test
+	void testDoesTheEditPartInTheOperationConcernAClassDiagramElement() {
+
+		/*
+		 * CreateEditPoliciesOperation.getEditPart is a final method and thus, not
+		 * supported by Mockito
+		 * 
+		 * This method is heavily based to isAnEditPartInAnUmlClassDiagram which can be
+		 * tested
+		 * 
+		 * Mockito.when(createEditPoliciesOperation.getEditPart()).thenReturn(
+		 * modelEditPart); assertEquals(providerToTest.
+		 * doesTheEditPartInTheOperationConcernAClassDiagramElement(
+		 * createEditPoliciesOperation),true);
+		 * 
+		 * Mockito.when(createEditPoliciesOperation.getEditPart()).thenReturn(
+		 * rootEditPart); assertEquals(providerToTest.
+		 * doesTheEditPartInTheOperationConcernAClassDiagramElement(
+		 * createEditPoliciesOperation),false);
+		 * 
+		 * EditPart simpleEditPart=Mockito.mock(EditPart.class);
+		 * Mockito.when(simpleEditPart.getParent()).thenReturn(modelEditPart);
+		 * Mockito.when(createEditPoliciesOperation.getEditPart()).thenReturn(
+		 * simpleEditPart); assertEquals(providerToTest.
+		 * doesTheEditPartInTheOperationConcernAClassDiagramElement(
+		 * createEditPoliciesOperation),true);
+		 */
+		assertEquals(true, true);
+	}
+
+	@Test
+	void testIsAnEditPartInAnUmlClassDiagram() {
+
+		assertEquals(providerToTest.isAnEditPartInAnUmlClassDiagram(modelEditPart), true);
+
+		assertEquals(providerToTest.isAnEditPartInAnUmlClassDiagram(rootEditPart), false);
+
+		EditPart simpleEditPart = Mockito.mock(EditPart.class);
+		Mockito.when(simpleEditPart.getParent()).thenReturn(modelEditPart);
+		assertEquals(providerToTest.isAnEditPartInAnUmlClassDiagram(simpleEditPart), true);
+
+	}
+
+	@Test
+	void testIsTheUselessEditPartRootElement() {
+		assertEquals(providerToTest.isTheUselessEditPartRootElement(rootEditPart), true);
+		assertEquals(providerToTest.isTheUselessEditPartRootElement(null), true);
+		assertEquals(providerToTest.isTheUselessEditPartRootElement(modelEditPart), false);
+	}
+
+	@Test
+	void testIsAnEditPartForAUmlClassDiagram() {
+		assertEquals(providerToTest.isAnEditPartForAUmlClassDiagram(modelEditPart), true);
+		assertEquals(providerToTest.isAnEditPartForAUmlClassDiagram(rootEditPart), false);
+	}
+
+	@Test
+	void testIsAnEditPartForAnOperationInUmlClass() {
+		OperationForClassEditPart opEditPart = Mockito.mock(OperationForClassEditPart.class);
+		assertEquals(providerToTest.isAnEditPartForAnOperationInUmlClass(opEditPart), true);
+	}
+
+	@Test
+	void testIsAnEditPartForAnUmlClassComponentPotentiallyHideable() {
+
+		assertEquals(
+				providerToTest.isAnEditPartForAnUmlClassComponentPotentiallyHideable(anAttributeCompartmentEditPart),
+				true);
+		assertEquals(
+				providerToTest.isAnEditPartForAnUmlClassComponentPotentiallyHideable(anOperationCompartmentEditPart),
+				true);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentPotentiallyHideable(anOperationForClassEditPart),
+				true);
+		assertEquals(providerToTest
+				.isAnEditPartForAnUmlClassComponentPotentiallyHideable(nestedClassifierCompartmentEditPart), true);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentPotentiallyHideable(modelEditPart), false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentPotentiallyHideable(rootEditPart), false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentPotentiallyHideable(classEditPart), false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentPotentiallyHideable(classNameEditPart), false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentPotentiallyHideable(classFloatingNameEditPart),
+				false);
+
+	}
+
+	@Test
+	void testIsAnEditPartForAnUmlClassComponentNotHideable() {
+
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(anAttributeCompartmentEditPart),
+				false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(anOperationCompartmentEditPart),
+				false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(anOperationForClassEditPart), false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(nestedClassifierCompartmentEditPart),
+				false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(modelEditPart), false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(rootEditPart), false);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(classEditPart), true);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(classNameEditPart), true);
+		assertEquals(providerToTest.isAnEditPartForAnUmlClassComponentNotHideable(classFloatingNameEditPart), true);
+
+	}
+
+	// *************************
+	//
+	// INNER CLASS FOR ACCESSING TO PROTECTED METHODS
+	//
+	// *************************
+
+	public class SubProvider extends
+			org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.providers.MouseCreationEditPolicyProvider {
+
+		public NotAClassEditPolicy policyForAnythingInClassDiagramButClassAndItsComponents;
+		public NotHideableClassElementEditPolicy policyForUmlClassComponentNotHideable;
+		public HideableClassElementEditPolicy policyForUmlClassComponentPotentiallyHideable;
+		public ContainerEditPolicy policyForUmlClassDiagram;
+
+		public EditPolicyFactory policiesFactory;
+
+		protected void initFakePoliciesFactory() {
+			policyForAnythingInClassDiagramButClassAndItsComponents = Mockito
+					.mock(NotAClassEditPolicy.class);
+			policyForUmlClassComponentNotHideable = Mockito.mock(NotHideableClassElementEditPolicy.class);
+			policyForUmlClassComponentPotentiallyHideable = Mockito
+					.mock(HideableClassElementEditPolicy.class);
+			policyForUmlClassDiagram = Mockito.mock(ContainerEditPolicy.class);
+
+			policiesFactory = Mockito.mock(EditPolicyFactory.class);
+			Mockito.when(
+					policiesFactory.createNotAClassEditPolicy(Mockito.anyObject()))
+					.thenReturn(policyForAnythingInClassDiagramButClassAndItsComponents);
+			Mockito.when(policiesFactory.createNotHideableClassElementEditPolicy(Mockito.anyObject()))
+					.thenReturn(policyForUmlClassComponentNotHideable);
+			Mockito.when(policiesFactory.createHideableClassElementEditPolicy(Mockito.anyObject()))
+					.thenReturn(policyForUmlClassComponentPotentiallyHideable);
+			Mockito.when(policiesFactory.createContainerEditPolicy(Mockito.anyObject()))
+					.thenReturn(policyForUmlClassDiagram);
+		}
+
+		@Override
+		protected EditPolicyFactory getPoliciesFactory() {
+			if (policiesFactory == null)
+				initFakePoliciesFactory();
+			return policiesFactory;
+		}
+
+		@Override
+		protected boolean isAnEditPolicyForCreationThatHasBeenAsked(IOperation operation) {
+			return super.isAnEditPolicyForCreationThatHasBeenAsked(operation);
+		}
+
+		@Override
+		protected boolean doesTheEditPartInTheOperationConcernAClassDiagramElement(IOperation operation) {
+			return super.doesTheEditPartInTheOperationConcernAClassDiagramElement(operation);
+		}
+
+		@Override
+		protected boolean isAnEditPartInAnUmlClassDiagram(EditPart editPart) {
+			return super.isAnEditPartInAnUmlClassDiagram(editPart);
+		}
+
+		@Override
+		protected boolean isTheUselessEditPartRootElement(EditPart editPart) {
+			return super.isTheUselessEditPartRootElement(editPart);
+		}
+
+		@Override
+		protected boolean isAnEditPartForAUmlClassDiagram(EditPart editPart) {
+			return super.isAnEditPartForAUmlClassDiagram(editPart);
+		}
+
+		@Override
+		protected boolean isAnEditPartForAnOperationInUmlClass(EditPart editPart) {
+			return super.isAnEditPartForAnOperationInUmlClass(editPart);
+		}
+
+		@Override
+		protected boolean isAnEditPartForAnUmlClassComponentPotentiallyHideable(EditPart editPart) {
+			return super.isAnEditPartForAnUmlClassComponentPotentiallyHideable(editPart);
+		}
+
+		@Override
+		protected boolean isAnEditPartForAnUmlClassComponentNotHideable(EditPart editPart) {
+			return super.isAnEditPartForAnUmlClassComponentNotHideable(editPart);
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/utils/ConcernedCompartment.java b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/utils/ConcernedCompartment.java
new file mode 100644
index 0000000..0f1dc62
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/utils/ConcernedCompartment.java
@@ -0,0 +1,168 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests.edit.policies.utils;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ArrayList;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.ElementType;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool.CreateAspectUnspecifiedTypeRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+class ConcernedCompartment {
+
+	org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment testChecker;
+	org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment fakeChecker;
+	CreateViewAndElementRequest createViewAndElementRequest;
+	CreateAspectUnspecifiedTypeRequest createAspectUnspecifiedTypeRequest;
+	DropObjectsRequest dropObjectsRequest;
+
+	public class MyViewDescriptor extends ViewDescriptor {
+
+		public MyViewDescriptor(IAdaptable elementAdapter, Class viewkind, boolean persisted,
+				PreferencesHint preferencesHint) {
+			super(elementAdapter, viewkind, persisted, preferencesHint);
+			// TODO Auto-generated constructor stub
+		}
+
+	}
+
+	@BeforeEach
+	void setUp() throws Exception {
+		testChecker = new org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment();
+		fakeChecker = Mockito.mock(org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment.class);
+
+		createViewAndElementRequest = Mockito.mock(CreateViewAndElementRequest.class);
+
+		ArrayList<MyViewDescriptor> descriptorList = new ArrayList<MyViewDescriptor>();
+		MyViewDescriptor mockDescriptor = Mockito.mock(MyViewDescriptor.class);
+		Mockito.when(mockDescriptor.getSemanticHint()).thenReturn("Property_ClassAttributeLabel");
+		descriptorList.add(mockDescriptor);
+		Mockito.doReturn(descriptorList).when(createViewAndElementRequest).getViewDescriptors();
+
+		createAspectUnspecifiedTypeRequest = Mockito.mock(CreateAspectUnspecifiedTypeRequest.class);
+		dropObjectsRequest = Mockito.mock(DropObjectsRequest.class);
+	}
+
+	CreateViewAndElementRequest makeACreateViewAndElementRequest(String semanticHint) {
+		CreateViewAndElementRequest createViewAndElementRequest = Mockito.mock(CreateViewAndElementRequest.class);
+		ArrayList<MyViewDescriptor> descriptorList = new ArrayList<MyViewDescriptor>();
+		MyViewDescriptor mockDescriptor = Mockito.mock(MyViewDescriptor.class);
+		Mockito.when(mockDescriptor.getSemanticHint()).thenReturn(semanticHint);
+		descriptorList.add(mockDescriptor);
+		Mockito.doReturn(descriptorList).when(createViewAndElementRequest).getViewDescriptors();
+		return createViewAndElementRequest;
+	}
+
+	CreateAspectUnspecifiedTypeRequest makeACreateAspectUnspecifiedTypeRequest(String displayNameStart) {
+		CreateAspectUnspecifiedTypeRequest createAspectUnspecifiedTypeRequest = Mockito
+				.mock(CreateAspectUnspecifiedTypeRequest.class);
+
+		ArrayList<ElementType> elementTypeList = new ArrayList<ElementType>();
+		Mockito.doReturn(elementTypeList).when(createAspectUnspecifiedTypeRequest).getElementTypes();
+
+		ElementType elementType = Mockito.mock(ElementType.class);
+		elementTypeList.add(elementType);
+
+		Mockito.when(elementType.getDisplayName()).thenReturn(displayNameStart);
+
+		return createAspectUnspecifiedTypeRequest;
+	}
+
+	// dropObjectsRequest.getObjects() is final so no possible mockito test
+	/*
+	 * DropObjectsRequest makeADropObjectsRequest(Object object) {
+	 * 
+	 * DropObjectsRequest dropObjectsRequest =
+	 * Mockito.mock(DropObjectsRequest.class);
+	 * 
+	 * ArrayList<Object> objectList = new ArrayList<Object>();
+	 * Mockito.when(dropObjectsRequest.getObjects()).thenReturn(objectList);
+	 * //Mockito.doReturn(objectList).when(dropObjectsRequest).getObjects();
+	 * 
+	 * objectList.add(object);
+	 * 
+	 * return dropObjectsRequest; }
+	 */
+
+	@AfterEach
+	void tearDown() throws Exception {
+	}
+
+	@Test
+	void testGetConcernedCompartment_CreateView() {
+		// getConcernedCompartment_CreateView has become protected so a subclass has to be created
+		/*
+		assertEquals(
+				testChecker.getConcernedCompartment_CreateView(makeACreateViewAndElementRequest(
+						org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart.VISUAL_ID)),
+				testChecker.PROPERTIES);
+		assertEquals(
+				testChecker.getConcernedCompartment_CreateView(makeACreateViewAndElementRequest(
+						org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart.VISUAL_ID)),
+				testChecker.OPERATIONS);
+		assertEquals(
+				testChecker.getConcernedCompartment_CreateView(makeACreateViewAndElementRequest(
+						org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart.VISUAL_ID)),
+				testChecker.NESTED_CLASSES);*/
+	}
+
+	@Test
+	void testGetConcernedCompartment_CreateAspect() {
+		// getConcernedCompartment_CreateView has become protected so a subclass has to be created
+		/*assertEquals(testChecker.getConcernedCompartment_CreateAspect(
+				makeACreateAspectUnspecifiedTypeRequest("Property___")), testChecker.PROPERTIES);
+		assertEquals(testChecker.getConcernedCompartment_CreateAspect(
+				makeACreateAspectUnspecifiedTypeRequest("Operation___")), testChecker.OPERATIONS);
+		assertEquals(
+				testChecker.getConcernedCompartment_CreateAspect(makeACreateAspectUnspecifiedTypeRequest("Class___")),
+				testChecker.NESTED_CLASSES);
+				*/
+	}
+
+	@Test
+	void testGetConcernedCompartment_Drop() {
+		// dropObjectsRequest.getObjects() is final so no possible mockito test
+		/*
+		 * assertEquals( testChecker.getConcernedCompartment_Drop(
+		 * makeADropObjectsRequest(Mockito.mock(org.eclipse.uml2.uml.Property.class))),
+		 * testChecker.PROPERTIES); assertEquals(
+		 * testChecker.getConcernedCompartment_Drop(
+		 * makeADropObjectsRequest(Mockito.mock(org.eclipse.uml2.uml.Operation.class))),
+		 * testChecker.OPERATIONS); assertEquals(
+		 * testChecker.getConcernedCompartment_Drop(
+		 * makeADropObjectsRequest(Mockito.mock(org.eclipse.uml2.uml.Class.class))),
+		 * testChecker.NESTED_CLASSES);
+		 */
+		assertEquals(true, true);
+	}
+
+	@Test
+	void testGetConcernedCompartment() {
+		assertEquals(
+				testChecker.getConcernedCompartment(makeACreateViewAndElementRequest(
+						org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart.VISUAL_ID)),
+				testChecker.PROPERTIES);
+		assertEquals(
+				testChecker.getConcernedCompartment(makeACreateViewAndElementRequest(
+						org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart.VISUAL_ID)),
+				testChecker.OPERATIONS);
+		assertEquals(
+				testChecker.getConcernedCompartment(makeACreateViewAndElementRequest(
+						org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart.VISUAL_ID)),
+				testChecker.NESTED_CLASSES);
+		assertEquals(testChecker.getConcernedCompartment(makeACreateAspectUnspecifiedTypeRequest("Property___")),
+				testChecker.PROPERTIES);
+		assertEquals(testChecker.getConcernedCompartment(makeACreateAspectUnspecifiedTypeRequest("Operation___")),
+				testChecker.OPERATIONS);
+		assertEquals(testChecker.getConcernedCompartment(makeACreateAspectUnspecifiedTypeRequest("Class___")),
+				testChecker.NESTED_CLASSES);
+	}
+
+}
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/utils/ExpandingCollapsing.java b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/utils/ExpandingCollapsing.java
new file mode 100644
index 0000000..7925096
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/autosizeableclasses/tests/edit/policies/utils/ExpandingCollapsing.java
@@ -0,0 +1,325 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.tests.edit.policies.utils;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.papyrus.infra.gmfdiag.css.CSSBasicCompartmentImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.CSSShapeImpl;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ConcernedCompartment;
+import org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.preference.Settings;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+class ExpandingCollapsing {
+
+	ClassEditPart classEditPart;
+	Settings settings;
+	MyExpandingCollapsing instanceToTest;
+
+	CSSShapeImpl cssShapeImpl;
+	BasicEList<EObject> compartments;
+	CSSBasicCompartmentImpl propertiesCompartment;
+	CSSBasicCompartmentImpl operationsCompartment;
+	CSSBasicCompartmentImpl nestedClassesCompartment;
+	org.eclipse.uml2.uml.Class umlClass;
+
+	@BeforeEach
+	void setUp() throws Exception {
+		// not used for the moment.
+	}
+
+	public org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ClassExpanderCollapser createExpandingCollapsing(
+			int concernedCompartment) {
+		classEditPart = mock(ClassEditPart.class);
+		settings = mock(Settings.class);
+		
+		instanceToTest = new MyExpandingCollapsing(classEditPart, concernedCompartment, settings);
+
+		cssShapeImpl = mock(CSSShapeImpl.class);
+		when(classEditPart.getModel()).thenReturn(cssShapeImpl);
+
+		compartments = new BasicEList<>();
+
+		propertiesCompartment = Mockito.mock(CSSBasicCompartmentImpl.class);
+		when(propertiesCompartment.getType()).thenReturn(ClassAttributeCompartmentEditPart.VISUAL_ID);
+		compartments.add(propertiesCompartment);
+
+		operationsCompartment = Mockito.mock(CSSBasicCompartmentImpl.class);
+		when(operationsCompartment.getType()).thenReturn(ClassOperationCompartmentEditPart.VISUAL_ID);
+		compartments.add(operationsCompartment);
+
+		nestedClassesCompartment = Mockito.mock(CSSBasicCompartmentImpl.class);
+		when(nestedClassesCompartment.getType()).thenReturn(ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+		compartments.add(nestedClassesCompartment);
+
+		when(cssShapeImpl.getChildren()).thenReturn(compartments);
+
+		umlClass = mock(org.eclipse.uml2.uml.Class.class);
+		when(cssShapeImpl.getElement()).thenReturn(umlClass);
+
+		return instanceToTest;
+	}
+
+	@AfterEach
+	void tearDown() throws Exception {
+	}
+
+	@Test
+	void testExpandingCollapsingClassEditPart() {
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+		assertEquals(ConcernedCompartment.PROPERTIES, instanceToTest.getConcernedCompartment());
+		createExpandingCollapsing(ConcernedCompartment.OPERATIONS);
+		assertEquals(ConcernedCompartment.OPERATIONS, instanceToTest.getConcernedCompartment());
+		assertEquals(settings, instanceToTest.getDefaultSettings());
+	}
+
+	@Test
+	void testExpandingCollapsingClassEditPartInt() {
+		testExpandingCollapsingClassEditPart();
+	}
+
+	@Test
+	void testCollapseIfPossible() {
+		assertEquals(true,true);
+	}
+
+	@Test
+	void testExpandIfPossible() {
+		assertEquals(true,true);
+	}
+
+	@Test
+	void testIsThereAConcernedCompartmentToDisplay() {
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+
+		BasicEList content = new BasicEList<>();
+		when(propertiesCompartment.getChildren()).thenReturn(content);
+
+		content = new BasicEList<>();
+		when(operationsCompartment.getChildren()).thenReturn(content);
+		content.add("anything");
+
+		content = new BasicEList<>();
+		when(nestedClassesCompartment.getChildren()).thenReturn(content);
+
+		assertEquals(instanceToTest.isThereAConcernedCompartmentToDisplay(), true);
+
+		createExpandingCollapsing(ConcernedCompartment.OPERATIONS);
+
+		content = new BasicEList<>();
+		when(propertiesCompartment.getChildren()).thenReturn(content);
+
+		content = new BasicEList<>();
+		when(operationsCompartment.getChildren()).thenReturn(content);
+		content.add("anything");
+
+		content = new BasicEList<>();
+		when(nestedClassesCompartment.getChildren()).thenReturn(content);
+
+		when(settings.isOnlyConcernedCompartment()).thenReturn(true);
+		
+		assertEquals(instanceToTest.isThereAConcernedCompartmentToDisplay(), false);
+		
+		when(settings.isOnlyConcernedCompartment()).thenReturn(false);
+		
+		assertEquals(instanceToTest.isThereAConcernedCompartmentToDisplay(), true);
+		
+	}
+
+	@Test
+	void testAreAllCompartmentsConcerned() {
+		createExpandingCollapsing(ConcernedCompartment.ALL);
+		when(settings.isOnlyConcernedCompartment()).thenReturn(true);
+		assertEquals(instanceToTest.areAllCompartmentsConcerned(), true);
+		
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+		when(settings.isOnlyConcernedCompartment()).thenReturn(false);
+		assertEquals(instanceToTest.areAllCompartmentsConcerned(), true);
+		
+		when(settings.isOnlyConcernedCompartment()).thenReturn(true);
+		assertEquals(instanceToTest.areAllCompartmentsConcerned(), false);
+		
+	}
+
+	@Test
+	void testIsCompartmentEmptyCompartmentEditPart() {
+		assertEquals(true, true);
+	}
+
+	@Test
+	void testIsCompartmentEmptyCSSBasicCompartmentImpl() {
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+		BasicEList content = new BasicEList<>();
+		when(propertiesCompartment.getChildren()).thenReturn(content);
+		assertEquals(instanceToTest.isCompartmentEmpty(propertiesCompartment), true);
+		content = new BasicEList<>();
+		when(operationsCompartment.getChildren()).thenReturn(content);
+		content.add("anything");
+		assertEquals(instanceToTest.isCompartmentEmpty(operationsCompartment), false);
+	}
+
+	@Test
+	void testSetCompartmentsVisibility() {
+		assertEquals(true,true);
+		// difficult to implement this test because it is based on setter through commands
+	}
+
+	@Test
+	void testIsThisACompartmentToDisplay() {
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+		when(settings.isOnlyConcernedCompartment()).thenReturn(false);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(propertiesCompartment), true);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(operationsCompartment), true);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(nestedClassesCompartment), true);
+
+		createExpandingCollapsing(ConcernedCompartment.OPERATIONS);
+		when(settings.isOnlyConcernedCompartment()).thenReturn(true);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(propertiesCompartment), false);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(operationsCompartment), true);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(nestedClassesCompartment), false);
+
+		createExpandingCollapsing(ConcernedCompartment.NESTED_CLASSES);
+		when(settings.isOnlyConcernedCompartment()).thenReturn(true);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(propertiesCompartment), false);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(operationsCompartment), false);
+		assertEquals(instanceToTest.isThisACompartmentToDisplay(nestedClassesCompartment), true);
+
+	}
+
+	@Test
+	void testGetClassCompartments() {
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+		List<BasicCompartment> classCompartments = instanceToTest.getClassCompartments();
+		int counter = 0;
+		for (BasicCompartment compartment : classCompartments) {
+			if (compartment.getType().equals(ClassAttributeCompartmentEditPart.VISUAL_ID)
+					|| compartment.getType().equals(ClassOperationCompartmentEditPart.VISUAL_ID)
+					|| compartment.getType().equals(ClassNestedClassifierCompartmentEditPart.VISUAL_ID))
+				counter++;
+
+		}
+		assertEquals(counter, 3);
+	}
+
+	@Test
+	void testAddALittleHeightForACompartment() {
+		assertEquals(true,true);
+		// difficult to implement this test because it is based on setter through commands
+	}
+
+	@Test
+	void testRemoveALittleHeightForACompartment() {
+		assertEquals(true,true);
+		// difficult to implement this test because it is based on setter through commands
+	}
+/*
+	@Test
+	void testGetConcernedCompartment() {
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+		assertEquals(instanceToTest.getConcernedCompartment(), ConcernedCompartment.PROPERTIES);
+	}
+
+	@Test
+	void testSetConcernedCompartment() {
+		createExpandingCollapsing(ConcernedCompartment.OPERATIONS);
+		assertEquals(instanceToTest.getConcernedCompartment(), ConcernedCompartment.OPERATIONS);
+	}
+
+	@Test
+	void testGetCSSShape() {
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+		assertEquals(instanceToTest.getCSSShape(), cssShapeImpl);
+	}
+
+	@Test
+	void testGetUmlClass() {
+		createExpandingCollapsing(ConcernedCompartment.PROPERTIES);
+		assertEquals(instanceToTest.getUmlClass(), umlClass);
+	}
+	*/
+
+	public class MyExpandingCollapsing extends org.eclipse.papyrus.uml.diagram.clazz.lf.autosizeableclasses.edit.policies.utils.ClassExpanderCollapser {
+
+		public MyExpandingCollapsing(ClassEditPart classEditPart) {
+			super(classEditPart);
+		}
+
+		public MyExpandingCollapsing(ClassEditPart classEditPart, int concernedCompartment) {
+			super(classEditPart, concernedCompartment);
+		}
+
+		public MyExpandingCollapsing(ClassEditPart classEditPart, int concernedCompartment, Settings defaultSettings) {
+			super(classEditPart, concernedCompartment, defaultSettings);
+		}
+
+		@Override
+		protected boolean isThereAConcernedCompartmentToDisplay() {
+			// override just to have access to protected method.
+			return super.isThereAConcernedCompartmentToDisplay();
+		}
+
+		@Override
+		protected boolean areAllCompartmentsConcerned() {
+			// override just to have access to protected method.
+			return super.areAllCompartmentsConcerned();
+		}
+
+		@Override
+		protected boolean isCompartmentEmpty(CompartmentEditPart compartment) {
+			// override just to have access to protected method.
+			return super.isCompartmentEmpty(compartment);
+		}
+
+		@Override
+		protected boolean isCompartmentEmpty(BasicCompartment compartment) {
+			// override just to have access to protected method.
+			return super.isCompartmentEmpty(compartment);
+		}
+
+		@Override
+		protected void setCompartmentsVisibility(boolean visibility) {
+			// override just to have access to protected method.
+			super.setCompartmentsVisibility(visibility);
+		}
+
+		@Override
+		protected boolean isThisACompartmentToDisplay(BasicCompartment compartment) {
+			// override just to have access to protected method.
+			return super.isThisACompartmentToDisplay(compartment);
+		}
+
+		@Override
+		protected List<BasicCompartment> getClassCompartments() {
+			// override just to have access to protected method.
+			return super.getClassCompartments();
+		}
+
+		@Override
+		protected void addALittleHeightForACompartment() {
+			// override just to have access to protected method.
+			super.addALittleHeightForACompartment();
+		}
+
+		@Override
+		protected void removeALittleHeightForACompartment() {
+			// override just to have access to protected method.
+			super.removeALittleHeightForACompartment();
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.classpath b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.classpath
new file mode 100644
index 0000000..dcb6fb3
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.project b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.project
new file mode 100644
index 0000000..60e7627
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.settings/org.eclipse.jdt.core.prefs b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..dbda3b2
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=10
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/META-INF/MANIFEST.MF b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..bfb1c11
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests.Activator
+Require-Bundle: org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-10
+Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests
+Bundle-ActivationPolicy: lazy
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/build.properties b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/tests/Activator.java b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/tests/Activator.java
new file mode 100644
index 0000000..8aa0008
--- /dev/null
+++ b/lookAndFeel/tests/org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests/src/org/eclipse/papyrus/uml/diagram/clazz/lf/classtextualedition/tests/Activator.java
@@ -0,0 +1,22 @@
+package org.eclipse.papyrus.uml.diagram.clazz.lf.classtextualedition.tests;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}