Merge branch 'sprint48'
diff --git a/org.eclipse.ote.mavenbuild/codeStyle/osee_check_style.xml b/org.eclipse.ote.mavenbuild/codeStyle/osee_check_style.xml
new file mode 100644
index 0000000..5f5f284
--- /dev/null
+++ b/org.eclipse.ote.mavenbuild/codeStyle/osee_check_style.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+ This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+ Checkstyle-Configuration: OSEE Checks (Eclipse)
+ Description:
+Slightly modified version of Sun Checks that better matches the default code formatter setting of Eclipse.
+-->
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="TreeWalker">
+ <property name="tabWidth" value="4"/>
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="MethodLength">
+ <property name="max" value="100"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="10"/>
+ </module>
+ <module name="RedundantModifier"/>
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock"/>
+ <module name="NeedBraces"/>
+ <module name="AvoidInlineConditionals"/>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="HiddenField"/>
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="RedundantThrows">
+ <property name="logLoadErrors" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
+ </module>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="DesignForExtension"/>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier"/>
+ <module name="ArrayTypeStyle"/>
+ <module name="UpperEll"/>
+ <module name="ExecutableStatementCount">
+ <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/>
+ </module>
+ <module name="UnnecessaryParentheses"/>
+ <module name="SuperClone"/>
+ <module name="StringLiteralEquality"/>
+ <module name="ReturnCount"/>
+ <module name="ParameterAssignment"/>
+ <module name="PackageDeclaration"/>
+ <module name="MultipleVariableDeclarations"/>
+ <module name="MultipleStringLiterals"/>
+ <module name="ModifiedControlVariable"/>
+ <module name="MissingCtor"/>
+ <module name="AvoidStaticImport"/>
+ <module name="AbstractClassName"/>
+ <module name="DeclarationOrder"/>
+ <module name="AnnotationUseStyle"/>
+ <module name="MissingDeprecated"/>
+ <module name="MissingOverride"/>
+ <module name="PackageAnnotation"/>
+ <module name="SuppressWarnings"/>
+ <module name="DefaultComesLast"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsAvoidNull"/>
+ <module name="FallThrough"/>
+ <module name="NestedIfDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="ThrowsCount"/>
+ <module name="CyclomaticComplexity"/>
+ <module name="NPathComplexity"/>
+ </module>
+</module>
diff --git a/org.eclipse.ote.mavenbuild/codeStyle/osee_java_style_format.xml b/org.eclipse.ote.mavenbuild/codeStyle/osee_java_style_format.xml
new file mode 100644
index 0000000..0350c97
--- /dev/null
+++ b/org.eclipse.ote.mavenbuild/codeStyle/osee_java_style_format.xml
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="OSEE Java Standard" version="11">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="3"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="3"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="3"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="3"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="49"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
diff --git a/org.eclipse.ote.mavenbuild/codeStyle/osee_pmd_rule_set.xml b/org.eclipse.ote.mavenbuild/codeStyle/osee_pmd_rule_set.xml
new file mode 100644
index 0000000..8cf263c
--- /dev/null
+++ b/org.eclipse.ote.mavenbuild/codeStyle/osee_pmd_rule_set.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- generated by Sonar -->
+<ruleset>
+ <description>Osee Sonar Way with Findbugs</description>
+ <rule ref="rulesets/coupling.xml/LooseCoupling">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingNPE">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/finalizers.xml/FinalizeOverloaded">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/finalizers.xml/AvoidCallingFinalize">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/UnusedModifier">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/optimizations.xml/UseArraysAsList">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptyWhileStmt">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/UselessOperationOnImmutable">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/BrokenNullCheck">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/BigIntegerInstantiation">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/CloseResource">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/InstantiationToGetClass">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/PreserveStackTrace">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/StringBufferInstantiationWithChar">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/codesize.xml/NcssMethodCount">
+ <priority>3</priority>
+ <properties>
+ <property name="minimum" value="50"/>
+ </properties>
+ </rule>
+ <rule ref="rulesets/codesize.xml/NcssTypeCount">
+ <priority>3</priority>
+ <properties>
+ <property name="minimum" value="800"/>
+ </properties>
+ </rule>
+ <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/SingularField">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/finalizers.xml/EmptyFinalizer">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/DontImportSun">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/optimizations.xml/AvoidArrayLoops">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptyIfStmt">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptyTryBlock">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptyFinallyBlock">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptySwitchStatements">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptySynchronizedBlock">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptyStaticInitializer">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/BooleanInstantiation">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/UselessOverridingMethod">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/UnusedNullCheckInEquals">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/EqualsNull">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/IdempotentOperations">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/SimplifyConditional">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/CompareObjectsWithEquals">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strictexception.xml/AvoidRethrowingException">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/AvoidDuplicateLiterals">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/StringInstantiation">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/StringToString">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/InefficientStringBuffering">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/UnnecessaryCaseChange">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/UseIndexOfChar">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/UselessStringValueOf">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/imports.xml/DontImportJavaLang">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/strings.xml/UseStringBufferLength">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/ClassNamingConventions">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/AvoidDollarSigns">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/ReplaceVectorWithList">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/ReplaceHashtableWithMap">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/ReplaceEnumerationWithIterator">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/AvoidAssertAsIdentifier">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/IntegerInstantiation">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/logging-java.xml/SystemPrintln">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/braces.xml/IfStmtsMustUseBraces">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/braces.xml/ForLoopsMustUseBraces">
+ <priority>3</priority>
+ </rule>
+</ruleset>
\ No newline at end of file
diff --git a/org.eclipse.ote.mavenbuild/pom.xml b/org.eclipse.ote.mavenbuild/pom.xml
index 099ea94..420f78d 100644
--- a/org.eclipse.ote.mavenbuild/pom.xml
+++ b/org.eclipse.ote.mavenbuild/pom.xml
@@ -19,6 +19,22 @@
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
<nebula-site>http://download.eclipse.org/technology/nebula/snapshot</nebula-site>
+
+ <maven-antrun-version>1.6</maven-antrun-version>
+ <ant-contrib-version>1.0b3</ant-contrib-version>
+ <jsch-version>0.1.42</jsch-version>
+ <ant-jsch-version>1.8.2</ant-jsch-version>
+ <ant-commons-net-version>1.7.0</ant-commons-net-version>
+ <commons-net-version>1.4.1</commons-net-version>
+ <jacoco-version>0.5.3.201107060350</jacoco-version>
+ <findbugs-version>2.5.2</findbugs-version>
+ <pmd-version>3.0</pmd-version>
+ <checkstyle-version>2.6</checkstyle-version>
+ <javadoc-version>2.8</javadoc-version>
+ <build-helper-maven-plugin-version>1.7</build-helper-maven-plugin-version>
+ <maven-resources-version>2.5</maven-resources-version>
+
+
</properties>
<repositories>
@@ -46,41 +62,38 @@
<profiles>
<profile>
- <id>sonar</id>
+ <id>check-style</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>allow-static-analysis</name>
+ </property>
</activation>
<properties>
- <sonar.jdbc.url></sonar.jdbc.url>
- <sonar.jdbc.driverClassName>org.postgresql.Driver</sonar.jdbc.driverClassName>
- <sonar.jdbc.username>sonar</sonar.jdbc.username>
- <sonar.jdbc.password>sonar</sonar.jdbc.password>
- <!-- SERVER ON A REMOTE HOST -->
- <sonar.host.url></sonar.host.url>
+ <checkstyle.reportPath>target/checkstyle</checkstyle.reportPath>
+ <checkstyle.configPath>../org.eclipse.ote.mavenbuild/codeStyle</checkstyle.configPath>
+ <checkstyle.configFile>${checkstyle.configPath}/osee_check_style.xml</checkstyle.configFile>
+ <checkstyle.failOnErrors>false</checkstyle.failOnErrors>
</properties>
- </profile>
-
- <profile>
- <id>checkstyle</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
+ <version>${checkstyle-version}</version>
<executions>
<execution>
- <id>check my sources</id>
+ <id>check-source-style</id>
+ <phase>verify</phase>
<goals>
<goal>checkstyle</goal>
</goals>
- <phase>verify</phase>
<configuration>
- <failOnErrors>false</failOnErrors>
+ <failOnErrors>${checkstyle.failOnErrors}</failOnErrors>
<consoleOutput>true</consoleOutput>
+ <outputFileFormat>xml</outputFileFormat>
+ <includes>*ote*</includes>
+ <configLocation>${checkstyle.configFile}</configLocation>
+ <outputDirectory>${checkstyle.reportPath}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -90,30 +103,189 @@
</profile>
<profile>
- <id>coverage</id>
+ <id>check-findbugs</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <property>
+ <name>allow-static-analysis</name>
+ </property>
</activation>
- <modules>
- <module>org.eclemma.runtime.equinox</module>
- </modules>
- </profile>
-
- <profile>
- <id>static-checks</id>
+ <properties>
+ <findbugs.reportPath>target/findbugs</findbugs.reportPath>
+ <findbugs.failOnErrors>false</findbugs.failOnErrors>
+ </properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
+ <version>${findbugs-version}</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <xmlOutputDirectory>${findbugs.reportPath}</xmlOutputDirectory>
+ <outputDirectory>${findbugs.reportPath}</outputDirectory>
+ <failOnError>${findbugs.failOnErrors}</failOnError>
+ <excludeFilterFile>${findbugs.filters.folder}/findbugs-exclude.xml</excludeFilterFile>
+ <maxHeap>1024</maxHeap>
+ <failOnError>false</failOnError>
+ <timeout>4860000</timeout>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>check-pmd</id>
+ <activation>
+ <property>
+ <name>allow-static-analysis</name>
+ </property>
+ </activation>
+ <properties>
+ <pmd.reportPath>target/pmd</pmd.reportPath>
+ <pmd.failOnErrors>false</pmd.failOnErrors>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd-version}</version>
+ <configuration>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.6</targetJdk>
+ <format>xml</format>
+ <failOnViolation>${pmd.failOnErrors}</failOnViolation>
+ <outputDirectory>${pmd.reportPath}</outputDirectory>
+ <targetDirectory>${pmd.reportPath}</targetDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>cpd-check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>sonar</id>
+ <activation>
+ <property>
+ <name>allow-sonar</name>
+ </property>
+ </activation>
+ <properties>
+ <sonar.language>java</sonar.language>
+ <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+ <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+
+ <sonar.jdbc.url>jdbc:postgresql://osee-build.msc.az.boeing.com:5432/sonar</sonar.jdbc.url>
+ <sonar.jdbc.driverClassName>org.postgresql.Driver</sonar.jdbc.driverClassName>
+ <sonar.jdbc.username>sonar</sonar.jdbc.username>
+ <sonar.jdbc.password>sonar</sonar.jdbc.password>
+
+ <sonar.host.url>http://osee-build.msc.az.boeing.com:9000/sonar</sonar.host.url>
+
+ <sonar.jacoco.reportPath>${coverage.folder}/coverage/jacoco.exec</sonar.jacoco.reportPath>
+ <sonar.surefire.reportsPath>../${project.artifactId}.tests/target/surefire-reports/</sonar.surefire.reportsPath>
+ <sonar.skippedModules>${project.artifactId}.test</sonar.skippedModules>
+
+ </properties>
+ </profile>
+
+ <profile>
+ <id>code-coverage</id>
+ <activation>
+ <property>
+ <name>allow-code-coverage</name>
+ </property>
+ </activation>
+ <properties>
+ <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+ <sonar.jacoco.reportPath>${coverage.folder}/coverage/jacoco.exec</sonar.jacoco.reportPath>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-version}</version>
+ <executions>
+ <execution>
+ <id>collect-coverage</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${sonar.jacoco.reportPath}</destFile>
+ <append>true</append>
+ </configuration>
+ </execution>
+ <!-- <execution> <id>create-coverage-reports</id> <phase>verify</phase>
+ <goals> <goal>report</goal> </goals> <configuration> <dataFile>${sonar.jacoco.reportPath}</dataFile>
+ <includes>*.osee.*</includes> <outputDirectory>${coverage.reportPath}</outputDirectory>
+ <outputEncoding>UTF-8</outputEncoding> </configuration> </execution> -->
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>create-javadoc</id>
+ <activation>
+ <property>
+ <name>allow-javadoc</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc-version}</version>
+ <configuration>
+ <debug>true</debug>
+ <maxmemory>1024m</maxmemory>
+ <sourcepath>src</sourcepath>
+ <author>true</author>
+ <version>true</version>
+ <aggregate>true</aggregate>
+ <encoding>ISO-8859-1</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc-version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
</profiles>
<build>
diff --git a/org.eclipse.ote.message.lookup/src/org/eclipse/ote/message/lookup/MessageInput.java b/org.eclipse.ote.message.lookup/src/org/eclipse/ote/message/lookup/MessageInput.java
index 3952144..c7b97b0 100644
--- a/org.eclipse.ote.message.lookup/src/org/eclipse/ote/message/lookup/MessageInput.java
+++ b/org.eclipse.ote.message.lookup/src/org/eclipse/ote/message/lookup/MessageInput.java
@@ -14,8 +14,11 @@
public interface MessageInput {
- String getLabel();
-
- void add(List<MessageInputItem> items);
-
+ String getLabel();
+
+ boolean messagesOnly();
+
+ void add(List<MessageInputItem> items);
+
+
}
diff --git a/org.eclipse.ote.ui.eviewer/src/org/eclipse/ote/ui/eviewer/MessageInputComponent.java b/org.eclipse.ote.ui.eviewer/src/org/eclipse/ote/ui/eviewer/MessageInputComponent.java
index 5fa20a7..6a08cc4 100644
--- a/org.eclipse.ote.ui.eviewer/src/org/eclipse/ote/ui/eviewer/MessageInputComponent.java
+++ b/org.eclipse.ote.ui.eviewer/src/org/eclipse/ote/ui/eviewer/MessageInputComponent.java
@@ -25,31 +25,36 @@
public class MessageInputComponent implements MessageInput {
- @Override
- public String getLabel() {
- return "Element Viewer";
- }
+ @Override
+ public String getLabel() {
+ return "Element Viewer";
+ }
- @Override
- public void add(List<MessageInputItem> items) {
- try {
- final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- ElementViewer elementViewer;
- elementViewer = (ElementViewer) page.showView(ElementViewer.VIEW_ID);
- recursiveAdd(elementViewer, items);
- } catch (PartInitException e) {
- OseeLog.log(getClass(), Level.SEVERE, "Unable to add messages to MessageWatch", e);
- }
- }
-
- private void recursiveAdd(ElementViewer elementViewer, List<MessageInputItem> items){
- for(MessageInputItem item:items){
- Object[] obj = item.getElementPath();
- if(obj != null){
- elementViewer.addElement(new ElementPath(Arrays.asList(item.getElementPath())));
- }
- recursiveAdd(elementViewer, item.getChildren());
- }
- }
+ @Override
+ public void add(List<MessageInputItem> items) {
+ try {
+ final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ ElementViewer elementViewer;
+ elementViewer = (ElementViewer) page.showView(ElementViewer.VIEW_ID);
+ recursiveAdd(elementViewer, items);
+ } catch (PartInitException e) {
+ OseeLog.log(getClass(), Level.SEVERE, "Unable to add messages to MessageWatch", e);
+ }
+ }
+
+ private void recursiveAdd(ElementViewer elementViewer, List<MessageInputItem> items){
+ for(MessageInputItem item:items){
+ Object[] obj = item.getElementPath();
+ if(obj != null){
+ elementViewer.addElement(new ElementPath(Arrays.asList(item.getElementPath())));
+ }
+ recursiveAdd(elementViewer, item.getChildren());
+ }
+ }
+
+ @Override
+ public boolean messagesOnly() {
+ return false;
+ }
}
diff --git a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageSearchView.java b/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageSearchView.java
index 0036c85..4ef5926 100644
--- a/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageSearchView.java
+++ b/org.eclipse.ote.ui.message.view/src/org/eclipse/ote/ui/message/view/MessageSearchView.java
@@ -289,29 +289,46 @@
if(selection.isEmpty() || messageInputComponent.getMessageInputs().size() == 0){
return null;
}
+ List<MessageInputItem> selectedItems = getSelectedItems(selection);
+ boolean includesElements = false;
+ for (MessageInputItem item : selectedItems) {
+ if (item.getChildren().isEmpty()) {
+ includesElements = true;
+ break;
+ }
+ }
final Menu previewMenu = new Menu(composite);
for(final MessageInput messageInput: messageInputComponent.getMessageInputs()){
+ if (includesElements && messageInput.messagesOnly()) {
+ continue;
+ }
MenuItem item = new MenuItem(previewMenu, SWT.CASCADE);
item.setText("Add to " + messageInput.getLabel());
item.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- List<MessageInputItem> selectedItems = new ArrayList<MessageInputItem>();
- @SuppressWarnings("rawtypes")
- Iterator it = selection.iterator();
- while(it.hasNext()){
- Object selectedItem = it.next();
- if(selectedItem instanceof MessageInputItem){
- selectedItems.add((MessageInputItem)selectedItem);
- }
- }
+ List<MessageInputItem> selectedItems = getSelectedItems(selection);
messageInput.add(selectedItems);
}
+
});
}
return previewMenu;
}
+ private List<MessageInputItem> getSelectedItems(final IStructuredSelection selection) {
+ List<MessageInputItem> selectedItems = new ArrayList<MessageInputItem>();
+ @SuppressWarnings("rawtypes")
+ Iterator it = selection.iterator();
+ while(it.hasNext()){
+ Object selectedItem = it.next();
+ if(selectedItem instanceof MessageInputItem){
+ selectedItems.add((MessageInputItem)selectedItem);
+ }
+ }
+ return selectedItems;
+ }
+
private void createActions() {
final TreeViewer ftv = treeViewer;
expandAction = new Action("Expand All") {
diff --git a/org.eclipse.ote.ui.message/OSGI-INF/MessageInputComponent.xml b/org.eclipse.ote.ui.message/OSGI-INF/MessageInputComponent.xml
index 6b9b576..cc5e78d 100644
--- a/org.eclipse.ote.ui.message/OSGI-INF/MessageInputComponent.xml
+++ b/org.eclipse.ote.ui.message/OSGI-INF/MessageInputComponent.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.ote.ui.message.MessageInput">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.ote.ui.message.MessageInputComponent">
<implementation class="org.eclipse.ote.ui.message.MessageInputComponent"/>
<service>
<provide interface="org.eclipse.ote.message.lookup.MessageInput"/>
diff --git a/org.eclipse.ote.ui.message/OSGI-INF/MessageInputComponentAll.xml b/org.eclipse.ote.ui.message/OSGI-INF/MessageInputComponentAll.xml
new file mode 100644
index 0000000..ea2ce04
--- /dev/null
+++ b/org.eclipse.ote.ui.message/OSGI-INF/MessageInputComponentAll.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.ote.ui.message.MessageInputComponentAll">
+ <implementation class="org.eclipse.ote.ui.message.MessageInputComponentAll"/>
+ <service>
+ <provide interface="org.eclipse.ote.message.lookup.MessageInput"/>
+ </service>
+</scr:component>
diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputComponent.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputComponent.java
index 77d975d..f9ce31b 100644
--- a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputComponent.java
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputComponent.java
@@ -10,17 +10,9 @@
*******************************************************************************/
package org.eclipse.ote.ui.message;
import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.ote.message.lookup.MessageInput;
import org.eclipse.ote.message.lookup.MessageInputItem;
-import org.eclipse.ote.ui.message.watch.AddWatchParameter;
-import org.eclipse.ote.ui.message.watch.ElementPath;
-import org.eclipse.ote.ui.message.watch.WatchView;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
public class MessageInputComponent implements MessageInput {
@@ -32,26 +24,12 @@
@Override
public void add(List<MessageInputItem> items) {
- AddWatchParameter watchParameter = new AddWatchParameter();
- add(watchParameter, items);
- try {
- final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- WatchView watchView = (WatchView) page.showView(WatchView.VIEW_ID);
- watchView.addWatchMessage(watchParameter);
- } catch (PartInitException e) {
- OseeLog.log(getClass(), Level.SEVERE, "Unable to add messages to MessageWatch", e);
- }
+ MessageInputUtil.add(items, false);
}
- private void add(AddWatchParameter watchParameter, List<MessageInputItem> items){
- for(MessageInputItem item:items){
- Object[] obj = item.getElementPath();
- if(obj != null){
- watchParameter.addMessage(item.getMessageClass(), new ElementPath(obj));
- } else {
- watchParameter.addMessage(item.getMessageClass());
- }
- }
+ @Override
+ public boolean messagesOnly() {
+ return false;
}
}
diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputComponentAll.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputComponentAll.java
new file mode 100644
index 0000000..e257a33
--- /dev/null
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputComponentAll.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.ote.ui.message;
+import java.util.List;
+
+import org.eclipse.ote.message.lookup.MessageInput;
+import org.eclipse.ote.message.lookup.MessageInputItem;
+
+
+public class MessageInputComponentAll implements MessageInput {
+
+ @Override
+ public String getLabel() {
+ return "Message Watch (All Elements)";
+ }
+
+ @Override
+ public void add(List<MessageInputItem> items) {
+ MessageInputUtil.add(items, true);
+ }
+
+ @Override
+ public boolean messagesOnly() {
+ return true;
+ }
+
+}
diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputUtil.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputUtil.java
new file mode 100644
index 0000000..775fa39
--- /dev/null
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/MessageInputUtil.java
@@ -0,0 +1,43 @@
+package org.eclipse.ote.ui.message;
+
+import java.util.List;
+import java.util.logging.Level;
+
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.ote.message.lookup.MessageInputItem;
+import org.eclipse.ote.ui.message.watch.AddWatchParameter;
+import org.eclipse.ote.ui.message.watch.ElementPath;
+import org.eclipse.ote.ui.message.watch.WatchView;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+
+public class MessageInputUtil {
+ public static void add(List<MessageInputItem> items, boolean recurse) {
+ AddWatchParameter watchParameter = new AddWatchParameter();
+ add(watchParameter, items, recurse);
+ try {
+ final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ WatchView watchView = (WatchView) page.showView(WatchView.VIEW_ID);
+ watchView.addWatchMessage(watchParameter);
+ } catch (PartInitException e) {
+ OseeLog.log(MessageInputUtil.class, Level.SEVERE, "Unable to add messages to MessageWatch", e);
+ }
+ }
+
+ private static void add(AddWatchParameter watchParameter, List<MessageInputItem> items, boolean recurse){
+ for(MessageInputItem item:items){
+ Object[] obj = item.getElementPath();
+ if(obj != null){
+ watchParameter.addMessage(item.getMessageClass(), new ElementPath(obj));
+ } else {
+ watchParameter.addMessage(item.getMessageClass());
+ }
+ if (recurse) {
+ add(watchParameter, item.getChildren(), true);
+ }
+ }
+ }
+
+
+}
