Updated for EMF 2.4 and EclipseLink 1.0.2

9 files changed, 328 insertions, 95 deletions

diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.classpath b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.classpath
index 304e86186..64c5e31b7 100644
--- a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.classpath
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..03710d336
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Tue Oct 12 14:12:28 CEST 2004
+eclipse.preferences.version=1
+
diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.jdt.core.prefs
index c399400dc..a1c92dd00 100644
--- a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,56 +1,268 @@
-#Tue Jun 12 00:19:15 CEST 2007
+#Sun Nov 02 00:14:53 CET 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+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_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_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_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.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+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.format_guardian_clause_on_one_line=false
+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=2
+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_member=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_opening_brace_in_array_initializer=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_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_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_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_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=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_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_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.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=160
+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=space
+org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..74116b037
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,6 @@
+#Sun Nov 02 00:13:12 CET 2008
+eclipse.preferences.version=1
+formatter_profile=_Teneo EclipseLink
+formatter_settings_version=11
+internal.default.compliance=default
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/META-INF/MANIFEST.MF
index 3421f303e..cc98a1b81 100644
--- a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.emf.teneo.eclipselink.elistfactory,
  org.junit
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/build.properties b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/build.properties
index bd3aad0dd..2b5eadc4c 100644
--- a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/build.properties
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/build.properties
@@ -4,7 +4,8 @@ bin.includes = .classpath,\
                build.properties,\
                META-INF/,\
                src/,\
-               .
+               .,\
+               plugin.properties
 source.. = src/
 output.. = bin/
                
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryTest.java b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryTest.java
index 6aaec11ee..d523eed1b 100644
--- a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryTest.java
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryTest.java
@@ -53,7 +53,7 @@ public class EListFactoryTest extends TestCase {
 
   public void testEListFactory() throws ClassNotFoundException {
 
-    for (Iterator i = ePackage.getEClassifiers().iterator(); i.hasNext();) {
+    for (Iterator<?> i = ePackage.getEClassifiers().iterator(); i.hasNext();) {
       EClassifier eClassifier = (EClassifier) i.next();
 
       if (eClassifier instanceof EClass) {
@@ -62,14 +62,14 @@ public class EListFactoryTest extends TestCase {
         if (!eClass.isInterface() && !eClass.isAbstract()) {
           System.out.println(eClass.getName());
 
-          for (Iterator j = eClass.getEAllStructuralFeatures().iterator(); j.hasNext();) {
+          for (Iterator<?> j = eClass.getEAllStructuralFeatures().iterator(); j.hasNext();) {
             EStructuralFeature eStructuralFeature = (EStructuralFeature) j.next();
             System.out.println("  " + eStructuralFeature.getName());
 
             if (!eStructuralFeature.isVolatile() && EElementUtil.isListType(eStructuralFeature)) {
               try {
                 EObject eObject = ePackage.getEFactoryInstance().create(eClass);
-                EList eList = EListFactory.eINSTANCE.createEList(eObject, eStructuralFeature);
+                EList<?> eList = EListFactory.eINSTANCE.createEList(eObject, eStructuralFeature);
 
                 String actualEListConstructor = EListFactoryTestUtil.getListConstructor(eList);
                 String expectedEListConstructor = EListFactoryTestUtil.getListConstructorFromGenModel(genModel, eList);
diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryTestUtil.java b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryTestUtil.java
index c3ae4b32e..21e12c2ac 100644
--- a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryTestUtil.java
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryTestUtil.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.EcoreEList;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.teneo.eclipselink.elistfactory.EElementUtil;
 
 public class EListFactoryTestUtil {
 
@@ -44,13 +43,13 @@ public class EListFactoryTestUtil {
     return (GenModel) genModelResource.getContents().get(0);
   }
 
-  public static String getListConstructor(final EList eList) {
+  public static String getListConstructor(final EList<?> eList) {
 
     String result = "";
     if (eList instanceof FeatureMap) {
       FeatureMap.Internal internalFeatureMap = (FeatureMap.Internal) eList;
       
-      result += EElementUtil.getSimpleTypeName(internalFeatureMap.getClass().getName());
+      result += internalFeatureMap.getClass().getSimpleName();
       result += "(";
       result += "this";
       result += ", ";
@@ -64,11 +63,12 @@ public class EListFactoryTestUtil {
       result += ")";
     }
     else if (eList instanceof EcoreEMap) {
-      EcoreEMap ecoreEMap = (EcoreEMap) eList;
+      EcoreEMap<?, ?> ecoreEMap = (EcoreEMap<?, ?>) eList;
       
-      result += EElementUtil.getSimpleTypeName(ecoreEMap.getClass().getName());
+      result += ecoreEMap.getClass().getSimpleName();
+      result += "<" + getEntryFeatureInstanceClassSimpleName(ecoreEMap, "key") + "," + getEntryFeatureInstanceClassSimpleName(ecoreEMap, "value") + ">";
       result += "(";
-      result += getEntryEClassName(ecoreEMap);
+      result += getEntryEClassLiteralName(ecoreEMap);
       result += ", ";
       result += ecoreEMap.getEStructuralFeature().getEType().getName() + "Impl.class";
       result += ", ";
@@ -78,11 +78,12 @@ public class EListFactoryTestUtil {
       result += ")";
     }
     else if (eList instanceof EcoreEList) {
-      EcoreEList ecoreEList = (EcoreEList) eList;
+      EcoreEList<?> ecoreEList = (EcoreEList<?>) eList;
 
-      result += EElementUtil.getSimpleTypeName(ecoreEList.getClass().getName());
+      result += getSimpleEcoreEListTypeName(ecoreEList.getClass().getName());
+      result += "<" + ecoreEList.getEStructuralFeature().getEType().getInstanceClass().getSimpleName() + ">";
       result += "(";
-      result += ecoreEList.getEStructuralFeature().getEType().getName() + ".class";
+      result += ecoreEList.getEStructuralFeature().getEType().getInstanceClass().getSimpleName() + ".class";
       result += ", ";
       result += "this";
       result += ", ";
@@ -97,8 +98,8 @@ public class EListFactoryTestUtil {
     }
     return result;
   }
-
-  public static String getListConstructorFromGenModel(final GenModel genModel, final EList eList) {
+  
+  public static String getListConstructorFromGenModel(final GenModel genModel, final EList<?> eList) {
 
     String result = "";
     EClass eOwnerClass = getOwnerClass(eList);
@@ -130,7 +131,17 @@ public class EListFactoryTestUtil {
   // helper methods
   //
 
-  private static String getEntryEClassName(final EcoreEMap ecoreEMap) {
+  private static String getEntryFeatureInstanceClassSimpleName(EcoreEMap<?, ?> ecoreEMap, String entryFeatureName) {
+
+    EClass eEntryType = (EClass) ecoreEMap.getEStructuralFeature().getEType();
+    EStructuralFeature entryFeature = eEntryType.getEStructuralFeature(entryFeatureName);
+    if (entryFeature != null) {
+    	return entryFeature.getEType().getInstanceClass().getSimpleName();
+    }
+	return "";
+  }
+
+  private static String getEntryEClassLiteralName(final EcoreEMap<?, ?> ecoreEMap) {
     
     String result = getSimplePackageInterfaceName(ecoreEMap.getEObject().eClass());
     result += ".Literals.";
@@ -148,36 +159,41 @@ public class EListFactoryTestUtil {
     return result;
   }
 
+  private static String getSimpleEcoreEListTypeName(String qualifiedEcoreEListTypeName) {
+
+    String rawSimpleEcoreEListTypeName = qualifiedEcoreEListTypeName.substring(qualifiedEcoreEListTypeName.lastIndexOf(".") + 1, qualifiedEcoreEListTypeName.length());
+    return rawSimpleEcoreEListTypeName.replace('$', '.');
+  }
+
   private static String getSimplePackageInterfaceName(final EClass eClass) {
 
-    String eQualifiedPackageClassName = eClass.getEPackage().getClass().getName();
-    String eSimplePackageClassName = EElementUtil.getSimpleTypeName(eQualifiedPackageClassName);
+    String eSimplePackageClassName = eClass.getEPackage().getClass().getSimpleName();
     return eSimplePackageClassName.replaceFirst("Impl$", "");
   }
 
-  private static EClass getOwnerClass(final EList eList) {
+  private static EClass getOwnerClass(final EList<?> eList) {
 
     EClass result = null;
     if (eList instanceof EcoreEList) {
-      EcoreEList ecoreEList = (EcoreEList) eList;
+      EcoreEList<?> ecoreEList = (EcoreEList<?>) eList;
       result = ecoreEList.getEObject().eClass();
     }
     if (eList instanceof EcoreEMap) {
-      EcoreEMap ecoreEMap = (EcoreEMap) eList;
+      EcoreEMap<?, ?> ecoreEMap = (EcoreEMap<?, ?>) eList;
       result = ecoreEMap.getEObject().eClass();
     }
     return result;
   }
 
-  private static EStructuralFeature getImplementedFeature(final EList eList) {
+  private static EStructuralFeature getImplementedFeature(final EList<?> eList) {
 
     EStructuralFeature result = null;
     if (eList instanceof EcoreEList) {
-      EcoreEList ecoreEList = (EcoreEList) eList;
+      EcoreEList<?> ecoreEList = (EcoreEList<?>) eList;
       result = ecoreEList.getEStructuralFeature();
     }
     if (eList instanceof EcoreEMap) {
-      EcoreEMap ecoreEMap = (EcoreEMap) eList;
+      EcoreEMap<?, ?> ecoreEMap = (EcoreEMap<?, ?>) eList;
       result = ecoreEMap.getEStructuralFeature();
     }
     return result;
@@ -188,7 +204,7 @@ public class EListFactoryTestUtil {
     GenClass result = null;
     GenPackage genPackage = genModel.findGenPackage(eClass.getEPackage());
     if (genPackage != null) {
-      for (Iterator iter = genPackage.getGenClasses().iterator(); iter.hasNext();) {
+      for (Iterator<?> iter = genPackage.getGenClasses().iterator(); iter.hasNext();) {
         GenClass genClass = (GenClass) iter.next();
         if (eClass.getName().equals(genClass.getEcoreClass().getName())) {
           result = genClass;
@@ -202,7 +218,7 @@ public class EListFactoryTestUtil {
 
     GenFeature result = null;
     GenClass genClass = findGenClass(genModel, eStructuralFeature.getEContainingClass());
-    for (Iterator i = genClass.getGenFeatures().iterator(); i.hasNext();) {
+    for (Iterator<?> i = genClass.getGenFeatures().iterator(); i.hasNext();) {
       GenFeature genFeature = (GenFeature) i.next();
       if (eStructuralFeature.getName().equals(genFeature.getEcoreFeature().getName())) {
         result = genFeature;
diff --git a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryUsageTest.java b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryUsageTest.java
index 748637428..cbc2fb699 100644
--- a/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryUsageTest.java
+++ b/tests/org.eclipse.emf.teneo.eclipselink.elistfactory.tests/src/org/eclipse/emf/extras/elistfactory/tests/EListFactoryUsageTest.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.teneo.eclipselink.elistfactory.EElementUtil;
 import org.eclipse.emf.teneo.eclipselink.elistfactory.EListFactory;
 
 /**
@@ -30,17 +29,13 @@ import org.eclipse.emf.teneo.eclipselink.elistfactory.EListFactory;
 public class EListFactoryUsageTest extends TestCase {
 
   private static final String TEST_PACKAGE_NS_URI = "http:///org/eclipse/emf/teneo/eclipselink/examples/library.ecore";
-  private static final String TEST_INTERFACE_PACKAGE_NAME = "org.eclipse.emf.teneo.eclipselink.examples.library";
 //  private static final String TEST_PACKAGE_NS_URI = "http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0";
-//  private static final String TEST_INTERFACE_PACKAGE_NAME = "org.eclipse.examples.library";
   
   private static final String ELIST_TEST_CLASS_NAME = "Library";
   private static final String ELIST_TEST_FEATURE_NAME = "books";
-  private static final String QUALIFIED_ELIST_TEST_CLASS_NAME = TEST_INTERFACE_PACKAGE_NAME + "." + ELIST_TEST_CLASS_NAME;
   
   private static final String EMAP_TEST_CLASS_NAME = null;
   private static final String EMAP_TEST_FEATURE_NAME = null;
-  private static final String QUALIFIED_EMAP_TEST_CLASS_NAME = TEST_INTERFACE_PACKAGE_NAME + "." + EMAP_TEST_CLASS_NAME;
   
   public void testRegularEListEMapUsage1() throws ClassNotFoundException {
     
@@ -48,7 +43,7 @@ public class EListFactoryUsageTest extends TestCase {
       return;
     }
     
-    EList eWritersList = EListFactory.eINSTANCE.createEList(TEST_PACKAGE_NS_URI, QUALIFIED_ELIST_TEST_CLASS_NAME, ELIST_TEST_FEATURE_NAME);
+    EList<?> eWritersList = EListFactory.eINSTANCE.createEList(TEST_PACKAGE_NS_URI, ELIST_TEST_CLASS_NAME, ELIST_TEST_FEATURE_NAME);
     System.out.println(EListFactoryTestUtil.getListConstructor(eWritersList));
   }
   
@@ -59,11 +54,11 @@ public class EListFactoryUsageTest extends TestCase {
     }
     
     EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(TEST_PACKAGE_NS_URI);
-    EClass eLibraryClass = (EClass) ePackage.getEClassifier(EElementUtil.getSimpleTypeName(ELIST_TEST_CLASS_NAME));
+    EClass eLibraryClass = (EClass) ePackage.getEClassifier(ELIST_TEST_CLASS_NAME);
     EFactory eLibraryFactory = ePackage.getEFactoryInstance();
     EObject eLibrary = eLibraryFactory.create(eLibraryClass);
     
-    EList eWritersList = EListFactory.eINSTANCE.createEList(eLibrary, ELIST_TEST_FEATURE_NAME);
+    EList<?> eWritersList = EListFactory.eINSTANCE.createEList(eLibrary, ELIST_TEST_FEATURE_NAME);
     System.out.println(EListFactoryTestUtil.getListConstructor(eWritersList));
   }
   
@@ -80,7 +75,7 @@ public class EListFactoryUsageTest extends TestCase {
     
     EStructuralFeature eBooksFeature = eLibraryClass.getEStructuralFeature(ELIST_TEST_FEATURE_NAME);
     
-    EList eWritersList = EListFactory.eINSTANCE.createEList(eLibrary, eBooksFeature);
+    EList<?> eWritersList = EListFactory.eINSTANCE.createEList(eLibrary, eBooksFeature);
     System.out.println(EListFactoryTestUtil.getListConstructor(eWritersList));
   }
 
@@ -90,7 +85,7 @@ public class EListFactoryUsageTest extends TestCase {
       return;
     }
     
-    EMap eBooksMap = EListFactory.eINSTANCE.createEMap(TEST_PACKAGE_NS_URI, QUALIFIED_EMAP_TEST_CLASS_NAME, EMAP_TEST_FEATURE_NAME);
+    EMap<?, ?> eBooksMap = EListFactory.eINSTANCE.createEMap(TEST_PACKAGE_NS_URI, EMAP_TEST_CLASS_NAME, EMAP_TEST_FEATURE_NAME);
     System.out.println(EListFactoryTestUtil.getListConstructor(eBooksMap));
   }
   
@@ -105,7 +100,7 @@ public class EListFactoryUsageTest extends TestCase {
     EFactory eLibraryFactory = ePackage.getEFactoryInstance();
     EObject eLibrary = eLibraryFactory.create(eLibraryClass);
     
-    EMap eBooksMap = EListFactory.eINSTANCE.createEMap(eLibrary, EMAP_TEST_FEATURE_NAME);
+    EMap<?, ?> eBooksMap = EListFactory.eINSTANCE.createEMap(eLibrary, EMAP_TEST_FEATURE_NAME);
     System.out.println(EListFactoryTestUtil.getListConstructor(eBooksMap));
   }
   
@@ -122,7 +117,7 @@ public class EListFactoryUsageTest extends TestCase {
     
     EStructuralFeature eBooksFeature = eLibraryClass.getEStructuralFeature(EMAP_TEST_FEATURE_NAME);
     
-    EMap eBooksMap = EListFactory.eINSTANCE.createEMap(eLibrary, eBooksFeature);
+    EMap<?, ?> eBooksMap = EListFactory.eINSTANCE.createEMap(eLibrary, eBooksFeature);
     System.out.println(EListFactoryTestUtil.getListConstructor(eBooksMap));
   }
 }