NEW - bug 369500: [SysML] Update to UML2.4 - Fix models and generators

https://bugs.eclipse.org/bugs/show_bug.cgi?id=369500

6 files changed, 374 insertions, 27 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF
index f15e8688569..87b7ae7dfa0 100644
--- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF
@@ -8,13 +8,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.common;bundle-version="2.7.0",
  org.eclipse.jet;bundle-version="1.1.1",
- org.eclipse.emf.ecore;bundle-version="2.8.0"
+ org.eclipse.emf.ecore;bundle-version="2.8.0",
+ org.eclipse.emf.codegen.ecore;bundle-version="2.8.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.emf.codegen.ecore.generator,
- org.eclipse.emf.codegen.ecore.genmodel,
- org.eclipse.emf.codegen.ecore.genmodel.generator,
- org.eclipse.emf.codegen.jet
 Export-Package: org.eclipse.papyrus.sysml.sysmloveruml.codegen,
  org.eclipse.papyrus.sysml.sysmloveruml.codegen.core,
  org.eclipse.papyrus.sysml.sysmloveruml.codegen.utils
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet
index efa122136ce..86f4d29fb84 100644
--- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet
+++ b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet
@@ -1,4 +1,4 @@
-<%@ jet package="org.eclipse.emf.codegen.ecore.templates.edit" imports="org.eclipse.emf.ecore.EStructuralFeature org.eclipse.emf.common.util.EList org.eclipse.emf.ecore.EClass org.eclipse.papyrus.sysml.sysmloveruml.codegen.generationUtils.SysMLOverUMLHelper java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="ItemProvider" version="$Id: ItemProvider.javajet,v 1.44 2009/10/20 13:39:38 davidms Exp $" %>

+<%@ jet package="org.eclipse.emf.codegen.ecore.templates.edit" imports="org.eclipse.uml2.codegen.ecore.genmodel.util.* org.eclipse.emf.common.util.* org.eclipse.emf.ecore.EStructuralFeature org.eclipse.emf.common.util.EList org.eclipse.emf.ecore.EClass org.eclipse.papyrus.sysml.sysmloveruml.codegen.generationUtils.SysMLOverUMLHelper java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="ItemProvider" version="$Id: ItemProvider.javajet,v 1.44 2009/10/20 13:39:38 davidms Exp $" %>

 <%

 /**

  * <copyright>

@@ -20,6 +20,7 @@
 package <%=genPackage.getProviderPackageName()%>;

 

 <%genModel.addImport("org.eclipse.uml2.uml.UMLPackage");%>

+<%genModel.addImport("org.eclipse.uml2.uml.util.UMLUtil");%>

 <%genModel.addImport("org.eclipse.emf.common.notify.AdapterFactory");%>

 <%genModel.addImport("org.eclipse.emf.common.notify.Notification");%>

 <%genModel.addImport("org.eclipse.emf.edit.provider.IEditingDomainItemProvider");%>

@@ -31,7 +32,6 @@ package <%=genPackage.getProviderPackageName()%>;
 <%genModel.addImport("org.eclipse.uml2.uml.Class");%>

 <%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory");%>

 <%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.IRootAdapterFactory");%>

-<%genModel.addImport("org.eclipse.papyrus.sysml.util.SysmlResource");%>

 <%genModel.addImport("java.util.regex.Pattern");%>

 <%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter");%>

 <%genModel.addImport("org.eclipse.uml2.uml.NamedElement");%>

@@ -141,9 +141,8 @@ public class <%=genClass.getProviderClassName()%>
 				final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);		

 				

 				<%=name%>.addAll(propertyDescriptors);

-  				Stereotype ste = (element).getAppliedStereotype(SysmlResource.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(genClass.getEcoreClass())%>_ID);

-				if(ste != null) {

-					EObject steApplication = (element).getStereotypeApplication(ste);

+			<%=genClass.getName()%> steApplication = UMLUtil.getStereotypeApplication(element, <%=genClass.getName()%>.class);

+			if(steApplication != null) {

 				<%for (GenFeature genFeature : genClass.getPropertyFeatures()) { %>

 					  		<%for(EClass basedClass2 : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>

 								<%=name%>.add(create<%=genFeature.getCapName()%>PropertyDescriptorFor<%=basedClass2.getName()%>(steApplication));

@@ -368,7 +367,8 @@ public class <%=genClass.getProviderClassName()%>
 		<%=genClass.getImportedInterfaceName()%> <%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%> = null;

   		<%for(EClass basedClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>

   			if ( object instanceof <%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%> ){

-  			Stereotype ste = ((<%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%>)object).getAppliedStereotype(SysmlResource.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(genClass.getEcoreClass())%>_ID);

+			EObject steApplication = UMLUtil.getStereotypeApplication((<%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%>) object, <%=genClass.getName()%>.class);

+			Stereotype ste = UMLUtil.getStereotype(steApplication);

   			if ( ste != null){

   				IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)%>);

 				String result = ite.getText(object);				

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..87efc48f236
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,281 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0

+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=0

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0

+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=next_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=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=false

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false

+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=150

+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=1

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1

+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_at_end_of_file_if_missing=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=do not 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_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_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=do not 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=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not 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=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not 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=do not 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=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=false

+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/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..32798a47bf2
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1

+formatter_profile=_Papyrus Formatter 0 blank lines

+formatter_settings_version=12

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties b/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
index 8417c756da3..697b7ea570b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
@@ -142,3 +142,60 @@ _UI_FlowDirection_out_literal = out
 _UI_FlowDirection_inout_literal = inout

 _UI_Optional_type = Optional

 _UI_Optional_base_Parameter_feature = Base Parameter

+_UI_Auxiliary_type = Auxiliary

+_UI_Call_type = Call

+_UI_Create_type = Create

+_UI_Derive_type = Derive

+_UI_Destroy_type = Destroy

+_UI_Document_type = Document

+_UI_File_type = File

+_UI_Entity_type = Entity

+_UI_Executable_type = Executable

+_UI_Focus_type = Focus

+_UI_Framework_type = Framework

+_UI_Implement_type = Implement

+_UI_ImplementationClass_type = Implementation Class

+_UI_Instantiate_type = Instantiate

+_UI_Library_type = Library

+_UI_Metaclass_type = Metaclass

+_UI_ModelLibrary_type = Model Library

+_UI_Process_type = Process

+_UI_Realization_type = Realization

+_UI_Refine_type = Refine

+_UI_Responsibility_type = Responsibility

+_UI_Script_type = Script

+_UI_Send_type = Send

+_UI_Service_type = Service

+_UI_Source_type = Source

+_UI_Specification_type = Specification

+_UI_Subsystem_type = Subsystem

+_UI_Trace_type = Trace

+_UI_Type_type = Type

+_UI_Utility_type = Utility

+_UI_Auxiliary_base_Class_feature = Base Class

+_UI_Call_base_Usage_feature = Base Usage

+_UI_Create_base_BehavioralFeature_feature = Base Behavioral Feature

+_UI_Create_base_Usage_feature = Base Usage

+_UI_Derive_base_Abstraction_feature = Base Abstraction

+_UI_Derive_computation_feature = Computation

+_UI_Destroy_base_BehavioralFeature_feature = Base Behavioral Feature

+_UI_File_base_Artifact_feature = Base Artifact

+_UI_Entity_base_Component_feature = Base Component

+_UI_Focus_base_Class_feature = Base Class

+_UI_Framework_base_Package_feature = Base Package

+_UI_Implement_base_Component_feature = Base Component

+_UI_ImplementationClass_base_Class_feature = Base Class

+_UI_Instantiate_base_Usage_feature = Base Usage

+_UI_Metaclass_base_Class_feature = Base Class

+_UI_ModelLibrary_base_Package_feature = Base Package

+_UI_Process_base_Component_feature = Base Component

+_UI_Realization_base_Classifier_feature = Base Classifier

+_UI_Refine_base_Abstraction_feature = Base Abstraction

+_UI_Responsibility_base_Usage_feature = Base Usage

+_UI_Send_base_Usage_feature = Base Usage

+_UI_Service_base_Component_feature = Base Component

+_UI_Specification_base_Classifier_feature = Base Classifier

+_UI_Subsystem_base_Component_feature = Base Component

+_UI_Trace_base_Abstraction_feature = Base Abstraction

+_UI_Type_base_Class_feature = Base Class

+_UI_Utility_base_Class_feature = Base Class

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
index 61455e19d73..9dd28e1db72 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
@@ -6,10 +6,9 @@
     templateDirectory="org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates" dynamicTemplates="true"

     redirection="" modelName="Sysml" editPluginClass="org.eclipse.papyrus.sysml.provider.SysmlEditPlugin"

     editorPluginClass="org.eclipse.papyrus.sysml.presentation.SysmlEditorPlugin" featureMapWrapperClass=""

-    codeFormatting="true" testSuiteClass="org.eclipse.papyrus.sysml.tests.SysmlAllTests"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"

-    editPluginID="org.eclipse.papyrus.sysml.edit" editorPluginID="org.eclipse.papyrus.sysml.editor"

-    usedGenPackages="platform:/plugin/org.eclipse.uml2.uml.profile.l2/model/L2.genmodel#//l2 platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">

+    testSuiteClass="org.eclipse.papyrus.sysml.tests.SysmlAllTests" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.sysml.edit"

+    editorPluginID="org.eclipse.papyrus.sysml.editor" usedGenPackages="platform:/plugin/org.eclipse.uml2.uml.profile.l2/model/L2.genmodel#//l2 platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">

   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">

     <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>

     <details key="UNION_PROPERTIES" value="PROCESS"/>

@@ -31,11 +30,12 @@
   <foreignModel>sysml.ecore</foreignModel>

   <templatePluginVariables>org.eclipse.papyrus.sysml.sysmloveruml.codegen</templatePluginVariables>

   <genPackages xsi:type="genmodel:GenPackage" prefix="Sysml" basePackage="org.eclipse.papyrus"

-      classPackageSuffix="internal.impl" generateExampleClass="false" multipleEditorPages="false"

-      generateModelWizard="false" ecorePackage="sysml.ecore#/">

+      disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+      multipleEditorPages="false" generateModelWizard="false" ecorePackage="sysml.ecore#/">

     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="sysml.ecore#//Dummy"/>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Modelelements" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//modelelements">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//modelelements">

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//modelelements/Conform">

         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

             propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//modelelements/Conform/base_Dependency"/>

@@ -65,7 +65,8 @@
       </genClasses>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Blocks" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//blocks">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//blocks">

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/Block">

         <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//blocks/Block/isEncapsulated"/>

         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

@@ -121,7 +122,8 @@
       </genClasses>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Portandflows" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//portandflows">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//portandflows">

       <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="sysml.ecore#//portandflows/FlowDirection">

         <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="sysml.ecore#//portandflows/FlowDirection/in"/>

         <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="sysml.ecore#//portandflows/FlowDirection/out"/>

@@ -154,7 +156,8 @@
       </genClasses>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Constraints" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//constraints">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//constraints">

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//constraints/ConstraintBlock"/>

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//constraints/ConstraintProperty">

         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

@@ -162,7 +165,8 @@
       </genClasses>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Activities" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//activities">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//activities">

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/Optional">

         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

             propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Optional/base_Parameter"/>

@@ -201,7 +205,8 @@
       </genClasses>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Allocations" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//allocations">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//allocations">

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//allocations/Allocate">

         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

             propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//allocations/Allocate/base_Abstraction"/>

@@ -220,7 +225,8 @@
       </genClasses>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Requirements" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//requirements">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//requirements">

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/DeriveReqt"/>

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/Verify"/>

       <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/Copy"/>

@@ -267,15 +273,18 @@
       </genClasses>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Interactions" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//interactions">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//interactions">

       <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="sysml.ecore#//interactions/Dummy"/>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Statemachines" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//statemachines">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//statemachines">

       <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="sysml.ecore#//statemachines/Dummy"/>

     </nestedGenPackages>

     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Usecases" basePackage="org.eclipse.papyrus.sysml"

-        classPackageSuffix="internal.impl" generateExampleClass="false" ecorePackage="sysml.ecore#//usecases">

+        disposableProviderFactory="true" classPackageSuffix="internal.impl" generateExampleClass="false"

+        ecorePackage="sysml.ecore#//usecases">

       <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="sysml.ecore#//usecases/Dummy"/>

     </nestedGenPackages>

   </genPackages>