LinkLF sample (external activation): external enabler plugin, initial
revision 

Change-Id: I6af9d325127af9c3ca4843b757de7c91e4d71d39
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.classpath b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.classpath
new file mode 100644
index 0000000..098194c
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.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.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.gitignore b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.project b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.project
new file mode 100644
index 0000000..061b763
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation</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/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.settings/org.eclipse.jdt.core.prefs b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..362ed2b
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+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=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+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=false
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+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=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=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/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.settings/org.eclipse.jdt.ui.prefs b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..42e882e
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_GMF Formatter Profile New
+formatter_settings_version=12
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/META-INF/MANIFEST.MF b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..fe1ff68
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: External activation of LinkLF mode for LinkLF sample diagram
+Bundle-SymbolicName: org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.core.expressions,
+ org.eclipse.jface,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.gmf.runtime.emf.core,
+ org.eclipse.gmf.runtime.emf.commands.core,
+ org.eclipse.gmf.runtime.emf.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.gmf.runtime.diagram.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui.providers,
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,
+ org.eclipse.gmf.runtime.diagram.ui.render,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
+ org.eclipse.gmf.tooling.examples.linklf.diagram,
+ org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)"
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/build.properties b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/build.properties
new file mode 100644
index 0000000..e9863e2
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/plugin.xml b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/plugin.xml
new file mode 100644
index 0000000..783c2ca
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/plugin.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+	<extension
+			id="diagramUIRenderEditPartProvider.LinkLFDiagram"
+			name="Custom DiagramRootEditPartProvider for LinkLFDiagram diagram"
+			point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+		<editpartProvider
+				class="org.eclipse.gmf.tooling.runtime.linklf.router.LinkLFDiagramRootEditPartProvider">
+			<Priority name="Medium"/>
+			<context providesRootEditPart="true"/>
+			<applicable-diagram type="linklf"/>
+		</editpartProvider>
+	</extension>
+	
+	<extension
+			point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+		<editpolicyProvider
+				class="org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation.LinkLFEnablerEditPolicyProvider">
+			<Priority name="Low"/>
+			<object class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)" id="nodes444">
+				<method 
+					name="getType()" 
+					value="2001,2002,2003,2004,3001,3002,3003,3004,3005"/>
+			</object>
+			<object class="org.eclipse.gmf.runtime.notation.Edge(org.eclipse.gmf.runtime.notation)" id="links444">
+				<method 
+					name="getType()" 
+					value="4001,4002"/>
+			</object>
+			<!--
+			<object class="org.eclipse.gmf.runtime.notation.Node" id="link-labels">
+				<method 
+					name="getType()" 
+					value="??????"/>
+			</object>
+			-->
+			<context editparts="nodes444,links444"/>
+		</editpolicyProvider>
+	</extension>
+	<extension
+			point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+		<editpolicyProvider
+				class="org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation.LinkLFXYLayoutEditPolicyProvider">
+			<Priority name="Low"/>
+			<object class="org.eclipse.gmf.runtime.notation.Diagram(org.eclipse.gmf.runtime.notation)" id="diagram">
+				<method 
+					name="getType()" 
+					value="linklf"/>
+			</object>
+			<object class="org.eclipse.gmf.runtime.notation.Compartment(org.eclipse.gmf.runtime.notation)" id="xy-compartments">
+				<method 
+					name="getType()" 
+					value="7001,7002"/>
+			</object>
+			<context editparts="diagram,xy-compartments"/>
+		</editpolicyProvider>
+	</extension>
+
+</plugin>
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/src/org/eclipse/gmf/tooling/examples/linklf/diagram/externalactivation/LinkLFEnablerEditPolicyProvider.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/src/org/eclipse/gmf/tooling/examples/linklf/diagram/externalactivation/LinkLFEnablerEditPolicyProvider.java
new file mode 100644
index 0000000..f7485a5
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/src/org/eclipse/gmf/tooling/examples/linklf/diagram/externalactivation/LinkLFEnablerEditPolicyProvider.java
@@ -0,0 +1,80 @@
+package org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation;
+
+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.IBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
+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.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.parts.CanvasEditPart;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeNodeAnchorDelegate;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFAnchorsDelegatingEditPart;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFConnectionNodeEditPart;
+import org.eclipse.gmf.tooling.runtime.linklf.policies.AdjustBorderItemAnchorsEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.policies.AdjustImplicitlyMovedLinksEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.policies.AdjustSyntheticBendpointsEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.policies.LinksLFGraphicalNodeEditPolicy;
+
+public class LinkLFEnablerEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	@Override
+	public boolean provides(IOperation op) {
+		if (false == op instanceof CreateEditPoliciesOperation) {
+			return false;
+		}
+		CreateEditPoliciesOperation operation = (CreateEditPoliciesOperation) op;
+		EditPart host = operation.getEditPart();
+
+		if (false == host instanceof IGraphicalEditPart) {
+			return false;
+		}
+
+		View notationView = ((IGraphicalEditPart) host).getNotationView();
+		if (notationView == null) {
+			return false;
+		}
+
+		Diagram diagram = notationView.getDiagram();
+		if (!isSupportedDiagram(diagram)) {
+			return false;
+		}
+		return true;
+	}
+
+	private boolean isSupportedDiagram(Diagram diagram) {
+		return diagram != null && CanvasEditPart.MODEL_ID.equals(diagram.getType());
+	}
+
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		if (editPart instanceof LinkLFConnectionNodeEditPart) {
+			installLinkEditPolicies((LinkLFConnectionNodeEditPart) editPart);
+		} else if (editPart instanceof INodeEditPart) {
+			installNodeEditPolicies((INodeEditPart) editPart);
+		}
+	}
+
+	protected void installLinkEditPolicies(LinkLFConnectionNodeEditPart linkEP) {
+		linkEP.setLinkLFEnabled(true);
+	}
+
+	protected void installNodeEditPolicies(INodeEditPart nodeEP) {
+		if (nodeEP instanceof LinkLFAnchorsDelegatingEditPart) {
+			LinkLFAnchorsDelegatingEditPart linklfEP = (LinkLFAnchorsDelegatingEditPart) nodeEP;
+			linklfEP.setAnchorDelegate(new LinkLFShapeNodeAnchorDelegate(linklfEP.getNodeFigure()));
+		}
+
+		nodeEP.installEditPolicy(AdjustSyntheticBendpointsEditPolicy.ROLE, new AdjustSyntheticBendpointsEditPolicy());
+		nodeEP.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new LinksLFGraphicalNodeEditPolicy());
+		nodeEP.installEditPolicy(AdjustImplicitlyMovedLinksEditPolicy.ROLE, new AdjustImplicitlyMovedLinksEditPolicy());
+		if (nodeEP instanceof IBorderItemEditPart) {
+			nodeEP.installEditPolicy(AdjustBorderItemAnchorsEditPolicy.ROLE, new AdjustBorderItemAnchorsEditPolicy());
+		}
+	}
+
+}
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/src/org/eclipse/gmf/tooling/examples/linklf/diagram/externalactivation/LinkLFXYLayoutEditPolicyProvider.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/src/org/eclipse/gmf/tooling/examples/linklf/diagram/externalactivation/LinkLFXYLayoutEditPolicyProvider.java
new file mode 100644
index 0000000..eaa9904
--- /dev/null
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation/src/org/eclipse/gmf/tooling/examples/linklf/diagram/externalactivation/LinkLFXYLayoutEditPolicyProvider.java
@@ -0,0 +1,53 @@
+package org.eclipse.gmf.tooling.examples.linklf.diagram.externalactivation;
+
+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.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
+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.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.parts.CanvasEditPart;
+import org.eclipse.gmf.tooling.runtime.linklf.xylayout.XYLayoutWithFixAnchorsEditPolicy;
+
+/**
+ * This provider replaces default XYLayoutEditPolicy with its LinkLF counterpart version.
+ * It is separated from "main" {@link LinkLFEnablerEditPolicyProvider} because it is common to replace {@link XYLayoutEditPolicy} 
+ * with custom version. 
+ * E.g, Papyrus installs advanced XYLayoutWithConstrainedResizedEditPolicy (which does similar trick) by default. 
+ */
+public class LinkLFXYLayoutEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	@Override
+	public boolean provides(IOperation op) {
+		if (false == op instanceof CreateEditPoliciesOperation) {
+			return false;
+		}
+		CreateEditPoliciesOperation operation = (CreateEditPoliciesOperation) op;
+		EditPart host = operation.getEditPart();
+
+		if (host instanceof ShapeCompartmentEditPart || host instanceof DiagramEditPart) {
+			View notationView = ((IGraphicalEditPart) host).getNotationView();
+			return notationView != null && isSupportedDiagram(notationView.getDiagram());
+		}
+		return false;
+	}
+
+	private boolean isSupportedDiagram(Diagram diagram) {
+		return diagram != null && CanvasEditPart.MODEL_ID.equals(diagram.getType());
+	}
+
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		EditPolicy defaultEP = editPart.getEditPolicy(EditPolicy.LAYOUT_ROLE);
+		if (defaultEP != null && defaultEP.getClass() == XYLayoutEditPolicy.class) {
+			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new XYLayoutWithFixAnchorsEditPolicy());
+		}
+	}
+
+}
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Circle2EditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Circle2EditPart.java
index 75410db..8d2784f 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Circle2EditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Circle2EditPart.java
@@ -12,18 +12,19 @@
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.Circle2ItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFShapeNodeEditPart;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * @generated
  */
-public class Circle2EditPart extends ShapeNodeEditPart {
+public class Circle2EditPart extends LinkLFShapeNodeEditPart {
 
 	/**
 	 * @generated
@@ -101,7 +102,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 		return result;
 	}
 
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/CircleEditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/CircleEditPart.java
index d163b89..e3818ff 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/CircleEditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/CircleEditPart.java
@@ -12,18 +12,19 @@
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.CircleItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFShapeNodeEditPart;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * @generated
  */
-public class CircleEditPart extends ShapeNodeEditPart {
+public class CircleEditPart extends LinkLFShapeNodeEditPart {
 
 	/**
 	 * @generated
@@ -101,7 +102,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 		return result;
 	}
 
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Container2EditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Container2EditPart.java
index 8a3778b..5c55a96 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Container2EditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Container2EditPart.java
@@ -9,7 +9,6 @@
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
@@ -28,12 +27,14 @@
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.LinklfTextSelectionEditPolicy;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.part.LinklfVisualIDRegistry;
 import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFBorderedShapeEditPart;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * @generated
  */
-public class Container2EditPart extends AbstractBorderedShapeEditPart {
+public class Container2EditPart extends LinkLFBorderedShapeEditPart {
 
 	/**
 	 * @generated
@@ -187,7 +188,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 		return result;
 	}
 
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerContainerCompartment2EditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerContainerCompartment2EditPart.java
index 0df13f2..b288ce0 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerContainerCompartment2EditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerContainerCompartment2EditPart.java
@@ -4,7 +4,6 @@
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.Request;
 import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
@@ -19,11 +18,12 @@
 import org.eclipse.gmf.tooling.examples.linklf.diagram.part.Messages;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.providers.LinklfElementTypes;
 import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
 
 /**
  * @generated
  */
-public class ContainerContainerCompartment2EditPart extends ShapeCompartmentEditPart {
+public class ContainerContainerCompartment2EditPart extends LinkLFShapeCompartmentEditPart {
 
 	/**
 	 * @generated
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerContainerCompartmentEditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerContainerCompartmentEditPart.java
index b88c951..ec09317 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerContainerCompartmentEditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerContainerCompartmentEditPart.java
@@ -4,7 +4,6 @@
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.Request;
 import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
@@ -19,11 +18,12 @@
 import org.eclipse.gmf.tooling.examples.linklf.diagram.part.Messages;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.providers.LinklfElementTypes;
 import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
 
 /**
  * @generated
  */
-public class ContainerContainerCompartmentEditPart extends ShapeCompartmentEditPart {
+public class ContainerContainerCompartmentEditPart extends LinkLFShapeCompartmentEditPart {
 
 	/**
 	 * @generated
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerEditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerEditPart.java
index 461b88a..110d9e0 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerEditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/ContainerEditPart.java
@@ -9,7 +9,6 @@
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
@@ -28,12 +27,14 @@
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.LinklfTextSelectionEditPolicy;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.part.LinklfVisualIDRegistry;
 import org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFBorderedShapeEditPart;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * @generated
  */
-public class ContainerEditPart extends AbstractBorderedShapeEditPart {
+public class ContainerEditPart extends LinkLFBorderedShapeEditPart {
 
 	/**
 	 * @generated
@@ -187,7 +188,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 		return result;
 	}
 
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/LabeledLinkEditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/LabeledLinkEditPart.java
index 627fe5f..54b49ed 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/LabeledLinkEditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/LabeledLinkEditPart.java
@@ -2,18 +2,18 @@
 
 import org.eclipse.draw2d.Connection;
 import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.LabeledLinkItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFConnectionNodeEditPart;
 
 /**
 	 * @generated
 	 */
-public class LabeledLinkEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {
+public class LabeledLinkEditPart extends LinkLFConnectionNodeEditPart implements ITreeBranchEditPart {
 
 	/**
 	 * @generated
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/LinkEditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/LinkEditPart.java
index 58bbc98..cf2deae7 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/LinkEditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/LinkEditPart.java
@@ -1,17 +1,17 @@
 package org.eclipse.gmf.tooling.examples.linklf.diagram.edit.parts;
 
 import org.eclipse.draw2d.Connection;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.LinkItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFConnectionNodeEditPart;
 
 /**
 	 * @generated
 	 */
-public class LinkEditPart extends ConnectionNodeEditPart implements ITreeBranchEditPart {
+public class LinkEditPart extends LinkLFConnectionNodeEditPart implements ITreeBranchEditPart {
 
 	/**
 	 * @generated
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/PortEditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/PortEditPart.java
index b4c27f7..54b0ab9 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/PortEditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/PortEditPart.java
@@ -17,6 +17,7 @@
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.PortItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -101,7 +102,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 
 		//FIXME: workaround for #154536
 		result.getBounds().setSize(result.getPreferredSize());
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Rectangle2EditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Rectangle2EditPart.java
index 338c103..32ab5b4 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Rectangle2EditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Rectangle2EditPart.java
@@ -11,18 +11,19 @@
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.Rectangle2ItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFShapeNodeEditPart;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * @generated
  */
-public class Rectangle2EditPart extends ShapeNodeEditPart {
+public class Rectangle2EditPart extends LinkLFShapeNodeEditPart {
 
 	/**
 	 * @generated
@@ -100,7 +101,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 		return result;
 	}
 
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/RectangleEditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/RectangleEditPart.java
index f1b0dbd..9dfe522 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/RectangleEditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/RectangleEditPart.java
@@ -11,18 +11,19 @@
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.RectangleItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFShapeNodeEditPart;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * @generated
  */
-public class RectangleEditPart extends ShapeNodeEditPart {
+public class RectangleEditPart extends LinkLFShapeNodeEditPart {
 
 	/**
 	 * @generated
@@ -100,7 +101,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 		return result;
 	}
 
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Rhombus2EditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Rhombus2EditPart.java
index 6ab1a9a..479c453 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Rhombus2EditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/Rhombus2EditPart.java
@@ -13,18 +13,19 @@
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.Rhombus2ItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFShapeNodeEditPart;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * @generated
  */
-public class Rhombus2EditPart extends ShapeNodeEditPart {
+public class Rhombus2EditPart extends LinkLFShapeNodeEditPart {
 
 	/**
 	 * @generated
@@ -102,7 +103,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 		return result;
 	}
 
diff --git a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/RhombusEditPart.java b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/RhombusEditPart.java
index e4c862a..eb80c76 100644
--- a/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/RhombusEditPart.java
+++ b/test-examples/linklf/xtend-external/org.eclipse.gmf.tooling.examples.linklf.diagram/src/org/eclipse/gmf/tooling/examples/linklf/diagram/edit/parts/RhombusEditPart.java
@@ -13,18 +13,19 @@
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tooling.examples.linklf.diagram.edit.policies.RhombusItemSemanticEditPolicy;
+import org.eclipse.gmf.tooling.runtime.linklf.LinkLFNodeFigure;
+import org.eclipse.gmf.tooling.runtime.linklf.editparts.LinkLFShapeNodeEditPart;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * @generated
  */
-public class RhombusEditPart extends ShapeNodeEditPart {
+public class RhombusEditPart extends LinkLFShapeNodeEditPart {
 
 	/**
 	 * @generated
@@ -102,7 +103,7 @@
 	 * @generated
 	 */
 	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
+		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this, 40, 40);
 		return result;
 	}