diff options
| author | slewis | 2007-10-14 00:34:21 +0000 |
|---|---|---|
| committer | slewis | 2007-10-14 00:34:21 +0000 |
| commit | ead472fc794b4dc645d15647d6c7212cfde1b10f (patch) | |
| tree | e9483d94462da7498f9b3b07f52e898ae8c0f7d4 /framework | |
| parent | 0b5e39a31f5a87ab14d0f8e1945b52cbca4bfa6c (diff) | |
| download | org.eclipse.ecf-ead472fc794b4dc645d15647d6c7212cfde1b10f.tar.gz org.eclipse.ecf-ead472fc794b4dc645d15647d6c7212cfde1b10f.tar.xz org.eclipse.ecf-ead472fc794b4dc645d15647d6c7212cfde1b10f.zip | |
Fixed warnings from equinox jdt jdt.ui and pde preferences.
Diffstat (limited to 'framework')
15 files changed, 594 insertions, 441 deletions
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs index aab0ca798..1092bf69f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,331 @@ -#Fri Feb 23 12:22:44 GMT 2007 +#Wed Oct 10 22:18:36 EDT 2007 eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.3 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +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.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +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=enabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=error +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +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=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +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=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +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=warning +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.3 +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=false +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not 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=do not 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=do not 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=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=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=800 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.ui.prefs b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.ui.prefs index 97df8ec10..9bb86c1d3 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.ui.prefs +++ b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.ui.prefs @@ -1,3 +1,57 @@ -#Fri Feb 23 12:22:44 GMT 2007 +#Wed Oct 10 22:18:36 EDT 2007 eclipse.preferences.version=1 -internal.default.compliance=user +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_core +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=; +org.eclipse.jdt.ui.ondemandthreshold=3 +org.eclipse.jdt.ui.staticondemandthreshold=99 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.make_local_variable_final=false +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_variable_declarations_final=true +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=false +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.pde.prefs b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.pde.prefs new file mode 100644 index 000000000..6686ccd10 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.pde.prefs @@ -0,0 +1,3 @@ +#Thu Apr 19 20:30:05 GMT-08:00 2007 +compilers.use-project=true +eclipse.preferences.version=1 diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java index 7705c6bbd..4e8c1c8e0 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java @@ -11,19 +11,12 @@ package org.eclipse.ecf.core.sharedobject; import java.util.Map; - -import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.*; import org.eclipse.ecf.core.AbstractContainerAdapterFactory; import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.identity.ID; -import org.eclipse.ecf.core.identity.IDFactory; -import org.eclipse.ecf.core.identity.IDCreateException; +import org.eclipse.ecf.core.identity.*; import org.eclipse.ecf.core.util.Trace; -import org.eclipse.ecf.internal.core.sharedobject.Activator; -import org.eclipse.ecf.internal.core.sharedobject.Messages; -import org.eclipse.ecf.internal.core.sharedobject.SharedObjectDebugOptions; +import org.eclipse.ecf.internal.core.sharedobject.*; /** * Abstract container adapter factory. This class implements the @@ -36,8 +29,7 @@ import org.eclipse.ecf.internal.core.sharedobject.SharedObjectDebugOptions; * @see #getSharedObjectAdapter(ISharedObjectContainer, Class) * */ -public abstract class AbstractSharedObjectContainerAdapterFactory extends - AbstractContainerAdapterFactory { +public abstract class AbstractSharedObjectContainerAdapterFactory extends AbstractContainerAdapterFactory { protected static final int ADD_ADAPTER_ERROR_CODE = 300001; @@ -55,10 +47,8 @@ public abstract class AbstractSharedObjectContainerAdapterFactory extends */ protected Object getContainerAdapter(IContainer container, Class adapterType) { if (ISharedObjectContainer.class.isInstance(container)) - return getSharedObjectAdapter((ISharedObjectContainer) container, - adapterType); - else - return null; + return getSharedObjectAdapter((ISharedObjectContainer) container, adapterType); + return null; } /** @@ -85,8 +75,7 @@ public abstract class AbstractSharedObjectContainerAdapterFactory extends * @return ISharedObject adapter. Must also implement adapterType interface * class */ - protected synchronized ISharedObject getSharedObjectAdapter( - ISharedObjectContainer container, Class adapterType) { + protected synchronized ISharedObject getSharedObjectAdapter(ISharedObjectContainer container, Class adapterType) { // Get adapter ID for given adapter type ID adapterID = createAdapterID(container, adapterType); if (adapterID == null) @@ -101,20 +90,12 @@ public abstract class AbstractSharedObjectContainerAdapterFactory extends ISharedObject adapter = createAdapter(container, adapterType, adapterID); if (adapter == null) return null; - Map adapterProperties = createAdapterProperties(container, adapterType, - adapterID, adapter); + Map adapterProperties = createAdapterProperties(container, adapterType, adapterID, adapter); try { manager.addSharedObject(adapterID, adapter, adapterProperties); } catch (SharedObjectAddException e) { - Trace.catching(Activator.PLUGIN_ID, - SharedObjectDebugOptions.EXCEPTIONS_CATCHING, - AbstractSharedObjectContainerAdapterFactory.class, - "getSharedObjectAdapter", e); //$NON-NLS-1$ - Activator.getDefault().log( - new Status(IStatus.ERROR, Activator.getDefault() - .getBundle().getSymbolicName(), - ADD_ADAPTER_ERROR_CODE, ADD_ADAPTER_ERROR_MESSAGE, - e)); + Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, AbstractSharedObjectContainerAdapterFactory.class, "getSharedObjectAdapter", e); //$NON-NLS-1$ + Activator.getDefault().log(new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(), ADD_ADAPTER_ERROR_CODE, ADD_ADAPTER_ERROR_MESSAGE, e)); return null; } return adapter; @@ -136,9 +117,7 @@ public abstract class AbstractSharedObjectContainerAdapterFactory extends * new shared object adapter. This implementation returns null. * Subclasses may override as appropriate */ - protected Map createAdapterProperties(ISharedObjectContainer container, - Class adapterType, ID sharedObjectID, - ISharedObject sharedObjectAdapter) { + protected Map createAdapterProperties(ISharedObjectContainer container, Class adapterType, ID sharedObjectID, ISharedObject sharedObjectAdapter) { return null; } @@ -153,21 +132,13 @@ public abstract class AbstractSharedObjectContainerAdapterFactory extends * {@link #getSharedObjectAdapter(ISharedObjectContainer, Class)} * will also return null */ - protected ID createAdapterID(ISharedObjectContainer container, - Class adapterType) { + protected ID createAdapterID(ISharedObjectContainer container, Class adapterType) { String singletonName = adapterType.getName(); try { return IDFactory.getDefault().createStringID(singletonName); } catch (IDCreateException e) { - Trace.catching(Activator.PLUGIN_ID, - SharedObjectDebugOptions.EXCEPTIONS_CATCHING, - AbstractSharedObjectContainerAdapterFactory.class, - "getAdapterID", e); //$NON-NLS-1$ - Activator.getDefault().log( - new Status(IStatus.ERROR, Activator.getDefault() - .getBundle().getSymbolicName(), - CREATE_ADAPTER_ID_ERROR_CODE, - CREATE_ADAPTER_ID_ERROR_MESSAGE, e)); + Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, AbstractSharedObjectContainerAdapterFactory.class, "getAdapterID", e); //$NON-NLS-1$ + Activator.getDefault().log(new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(), CREATE_ADAPTER_ID_ERROR_CODE, CREATE_ADAPTER_ID_ERROR_MESSAGE, e)); return null; } } @@ -188,8 +159,7 @@ public abstract class AbstractSharedObjectContainerAdapterFactory extends * {@link #getSharedObjectAdapter(ISharedObjectContainer, Class)} * will also return null */ - protected abstract ISharedObject createAdapter( - ISharedObjectContainer container, Class adapterType, ID adapterID); + protected abstract ISharedObject createAdapter(ISharedObjectContainer container, Class adapterType, ID adapterID); public abstract Class[] getAdapterList(); diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java index cf1b23c84..c0406a0f9 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java @@ -11,27 +11,15 @@ package org.eclipse.ecf.core.sharedobject; import java.io.IOException; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Vector; - -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; +import java.util.*; +import org.eclipse.core.runtime.*; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IIdentifiable; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; -import org.eclipse.ecf.core.sharedobject.events.RemoteSharedObjectEvent; +import org.eclipse.ecf.core.sharedobject.events.*; import org.eclipse.ecf.core.sharedobject.util.IQueueEnqueue; import org.eclipse.ecf.core.sharedobject.util.QueueException; -import org.eclipse.ecf.core.util.Event; -import org.eclipse.ecf.core.util.IEventProcessor; -import org.eclipse.ecf.core.util.Trace; -import org.eclipse.ecf.internal.core.sharedobject.Activator; -import org.eclipse.ecf.internal.core.sharedobject.Messages; -import org.eclipse.ecf.internal.core.sharedobject.SharedObjectDebugOptions; +import org.eclipse.ecf.core.util.*; +import org.eclipse.ecf.internal.core.sharedobject.*; /** * Base class for shared object classes. This base class provides a number of @@ -69,8 +57,7 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { super(); } - public final void init(ISharedObjectConfig initData) - throws SharedObjectInitException { + public final void init(ISharedObjectConfig initData) throws SharedObjectInitException { this.config = initData; traceEntering("init", initData); //$NON-NLS-1$ addEventProcessor(new SharedObjectMsgEventProcessor(this)); @@ -194,8 +181,8 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { ID home = getHomeContainerID(); if (local == null || home == null) { return false; - } else - return (local.equals(home)); + } + return (local.equals(home)); } protected Map getProperties() { @@ -221,8 +208,7 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { protected void destroySelfLocal() { traceEntering("destroySelfLocal"); //$NON-NLS-1$ try { - ISharedObjectManager manager = getContext() - .getSharedObjectManager(); + ISharedObjectManager manager = getContext().getSharedObjectManager(); if (manager != null) { manager.removeSharedObject(getID()); } @@ -252,13 +238,11 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { * thrown if the local container is not connected or unable to * send for other reason */ - protected void sendSharedObjectMsgTo(ID toID, SharedObjectMsg msg) - throws IOException { - Assert.isNotNull(msg,Messages.BaseSharedObject_Message_Not_Null); + protected void sendSharedObjectMsgTo(ID toID, SharedObjectMsg msg) throws IOException { + Assert.isNotNull(msg, Messages.BaseSharedObject_Message_Not_Null); String method = "sendSharedObjectMsgTo"; //$NON-NLS-1$ - traceEntering(method, new Object[] { toID, msg }); - getContext().sendMessage(toID, - new SharedObjectMsgEvent(getID(), toID, msg)); + traceEntering(method, new Object[] {toID, msg}); + getContext().sendMessage(toID, new SharedObjectMsgEvent(getID(), toID, msg)); traceExiting(method); } @@ -271,8 +255,7 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { * throws if the local container is not connect or unable to * send for other reason */ - protected void sendSharedObjectMsgToPrimary(SharedObjectMsg msg) - throws IOException { + protected void sendSharedObjectMsgToPrimary(SharedObjectMsg msg) throws IOException { sendSharedObjectMsgTo(getHomeContainerID(), msg); } @@ -291,8 +274,7 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { return; IQueueEnqueue queue = context.getQueue(); try { - queue.enqueue(new SharedObjectMsgEvent(getID(), getContext() - .getLocalContainerID(), msg)); + queue.enqueue(new SharedObjectMsgEvent(getID(), getContext().getLocalContainerID(), msg)); } catch (QueueException e) { traceCatching("sendSharedObjectMsgToSelf", e); //$NON-NLS-1$ log(DESTROYREMOTE_CODE, "sendSharedObjectMsgToSelf", e); //$NON-NLS-1$ @@ -311,8 +293,7 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { * @param event * @return SharedObjectMsg the SharedObjectMsg delivered by the given event */ - protected SharedObjectMsg getSharedObjectMsgFromEvent( - ISharedObjectMessageEvent event) { + protected SharedObjectMsg getSharedObjectMsgFromEvent(ISharedObjectMessageEvent event) { traceEntering("getSharedObjectMsgFromEvent", event); //$NON-NLS-1$ Object eventData = event.getData(); Object msgData = null; @@ -330,10 +311,9 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { if (msgData != null && msgData instanceof SharedObjectMsg) { traceExiting("getSharedObjectMsgFromEvent", msgData); //$NON-NLS-1$ return (SharedObjectMsg) msgData; - } else { - traceExiting("getSharedObjectMsgFromEvent", null); //$NON-NLS-1$ - return null; } + traceExiting("getSharedObjectMsgFromEvent", null); //$NON-NLS-1$ + return null; } /** @@ -376,8 +356,7 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { * If false the provided Event should be passed to subsequent event * processors. */ - protected boolean handleSharedObjectCreateResponseEvent( - ISharedObjectCreateResponseEvent createResponseEvent) { + protected boolean handleSharedObjectCreateResponseEvent(ISharedObjectCreateResponseEvent createResponseEvent) { return false; } @@ -410,9 +389,7 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { */ protected ReplicaSharedObjectDescription getReplicaDescription(ID receiver) { traceEntering("getReplicaDescription", receiver); //$NON-NLS-1$ - ReplicaSharedObjectDescription result = new ReplicaSharedObjectDescription( - getClass(), getID(), getConfig().getHomeContainerID(), - getConfig().getProperties()); + ReplicaSharedObjectDescription result = new ReplicaSharedObjectDescription(getClass(), getID(), getConfig().getHomeContainerID(), getConfig().getProperties()); traceExiting("getReplicaDescription", result); //$NON-NLS-1$ return result; } @@ -444,14 +421,12 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { * parameter. * */ - protected ReplicaSharedObjectDescription[] getReplicaDescriptions( - ID[] receivers) { + protected ReplicaSharedObjectDescription[] getReplicaDescriptions(ID[] receivers) { traceEntering("getReplicaDescriptions", receivers); //$NON-NLS-1$ ReplicaSharedObjectDescription[] descriptions = null; if (receivers == null || receivers.length == 1) { descriptions = new ReplicaSharedObjectDescription[1]; - descriptions[0] = getReplicaDescription((receivers == null) ? null - : receivers[0]); + descriptions[0] = getReplicaDescription((receivers == null) ? null : receivers[0]); } else { descriptions = new ReplicaSharedObjectDescription[receivers.length]; for (int i = 0; i < receivers.length; i++) { @@ -493,13 +468,10 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { ReplicaSharedObjectDescription[] createInfos = getReplicaDescriptions(remoteContainers); if (createInfos != null) { if (createInfos.length == 1) { - getContext().sendCreate( - (remoteContainers == null) ? null - : remoteContainers[0], createInfos[0]); + getContext().sendCreate((remoteContainers == null) ? null : remoteContainers[0], createInfos[0]); } else { for (int i = 0; i < remoteContainers.length; i++) { - getContext().sendCreate(remoteContainers[i], - createInfos[i]); + getContext().sendCreate(remoteContainers[i], createInfos[i]); } } } @@ -511,15 +483,13 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { } protected void log(int code, String method, Throwable e) { - Activator.getDefault().log( - new Status(IStatus.ERROR, Activator.PLUGIN_ID, code, - getSharedObjectAsString(method), e)); + Activator.getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, code, getSharedObjectAsString(method), e)); } protected void log(String method, Throwable e) { - log(IStatus.ERROR,method,e); + log(IStatus.ERROR, method, e); } - + private String getSharedObjectAsString(String suffix) { StringBuffer buf = new StringBuffer(String.valueOf(getID())); buf.append(((isPrimary()) ? ".p." : ".r.")); //$NON-NLS-1$ //$NON-NLS-2$ @@ -528,39 +498,27 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { } protected void traceEntering(String methodName) { - Trace.entering(Activator.PLUGIN_ID, - SharedObjectDebugOptions.METHODS_ENTERING, this.getClass(), - getSharedObjectAsString(methodName)); + Trace.entering(Activator.PLUGIN_ID, SharedObjectDebugOptions.METHODS_ENTERING, this.getClass(), getSharedObjectAsString(methodName)); } protected void traceEntering(String methodName, Object[] params) { - Trace.entering(Activator.PLUGIN_ID, - SharedObjectDebugOptions.METHODS_ENTERING, this.getClass(), - getSharedObjectAsString(methodName)); + Trace.entering(Activator.PLUGIN_ID, SharedObjectDebugOptions.METHODS_ENTERING, this.getClass(), getSharedObjectAsString(methodName)); } protected void traceEntering(String methodName, Object param) { - Trace.entering(Activator.PLUGIN_ID, - SharedObjectDebugOptions.METHODS_ENTERING, this.getClass(), - getSharedObjectAsString(methodName)); + Trace.entering(Activator.PLUGIN_ID, SharedObjectDebugOptions.METHODS_ENTERING, this.getClass(), getSharedObjectAsString(methodName)); } protected void traceExiting(String methodName) { - Trace.entering(Activator.PLUGIN_ID, - SharedObjectDebugOptions.METHODS_EXITING, this.getClass(), - getSharedObjectAsString(methodName)); + Trace.entering(Activator.PLUGIN_ID, SharedObjectDebugOptions.METHODS_EXITING, this.getClass(), getSharedObjectAsString(methodName)); } protected void traceExiting(String methodName, Object result) { - Trace.entering(Activator.PLUGIN_ID, - SharedObjectDebugOptions.METHODS_EXITING, this.getClass(), - getSharedObjectAsString(methodName)); + Trace.entering(Activator.PLUGIN_ID, SharedObjectDebugOptions.METHODS_EXITING, this.getClass(), getSharedObjectAsString(methodName)); } protected void traceCatching(String method, Throwable t) { - Trace.catching(Activator.PLUGIN_ID, - SharedObjectDebugOptions.EXCEPTIONS_CATCHING, this.getClass(), - getSharedObjectAsString(method), t); + Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, this.getClass(), getSharedObjectAsString(method), t); } } diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java index 5dab0d454..f900cef95 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java @@ -8,10 +8,7 @@ ******************************************************************************/ package org.eclipse.ecf.core.sharedobject; -import org.eclipse.ecf.core.ContainerCreateException; -import org.eclipse.ecf.core.ContainerFactory; -import org.eclipse.ecf.core.ContainerTypeDescription; -import org.eclipse.ecf.core.IContainer; +import org.eclipse.ecf.core.*; import org.eclipse.ecf.core.util.Trace; import org.eclipse.ecf.internal.core.sharedobject.Activator; import org.eclipse.ecf.internal.core.sharedobject.Messages; @@ -33,14 +30,14 @@ import org.eclipse.ecf.internal.core.sharedobject.Messages; * </code> * */ -public class SharedObjectContainerFactory implements - ISharedObjectContainerFactory { +public class SharedObjectContainerFactory implements ISharedObjectContainerFactory { protected static ISharedObjectContainerFactory instance = null; static { instance = new SharedObjectContainerFactory(); } protected SharedObjectContainerFactory() { + // null constructor } public static ISharedObjectContainerFactory getDefault() { @@ -57,22 +54,16 @@ public class SharedObjectContainerFactory implements * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(org.eclipse.ecf.core.SharedObjectContainerDescription, * java.lang.Object[]) */ - public ISharedObjectContainer createSharedObjectContainer( - ContainerTypeDescription desc, Object[] args) - throws ContainerCreateException { + public ISharedObjectContainer createSharedObjectContainer(ContainerTypeDescription desc, Object[] args) throws ContainerCreateException { trace("createSharedObjectContainer(" + desc + "," //$NON-NLS-1$ //$NON-NLS-2$ + Trace.getArgumentsString(args) + ")"); //$NON-NLS-1$ if (desc == null) - throw new ContainerCreateException( - Messages.SharedObjectContainerFactory_Exception_Description_Not_Null); - IContainer newContainer = ContainerFactory.getDefault() - .createContainer(desc, args); - ISharedObjectContainer soContainer = (ISharedObjectContainer) newContainer - .getAdapter(ISharedObjectContainer.class); + throw new ContainerCreateException(Messages.SharedObjectContainerFactory_Exception_Description_Not_Null); + IContainer newContainer = ContainerFactory.getDefault().createContainer(desc, args); + ISharedObjectContainer soContainer = (ISharedObjectContainer) newContainer.getAdapter(ISharedObjectContainer.class); if (soContainer == null) { newContainer.dispose(); - throw new ContainerCreateException( - Messages.SharedObjectContainerFactory_Exception_Container_Wrong_Type); + throw new ContainerCreateException(Messages.SharedObjectContainerFactory_Exception_Container_Wrong_Type); } return soContainer; } @@ -82,10 +73,8 @@ public class SharedObjectContainerFactory implements * * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String) */ - public ISharedObjectContainer createSharedObjectContainer( - String descriptionName) throws ContainerCreateException { - return createSharedObjectContainer(ContainerFactory.getDefault() - .getDescriptionByName(descriptionName), null); + public ISharedObjectContainer createSharedObjectContainer(String descriptionName) throws ContainerCreateException { + return createSharedObjectContainer(ContainerFactory.getDefault().getDescriptionByName(descriptionName), null); } /* @@ -94,11 +83,8 @@ public class SharedObjectContainerFactory implements * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String, * java.lang.Object[]) */ - public ISharedObjectContainer createSharedObjectContainer( - String descriptionName, Object[] args) - throws ContainerCreateException { - return createSharedObjectContainer(ContainerFactory.getDefault() - .getDescriptionByName(descriptionName), args); + public ISharedObjectContainer createSharedObjectContainer(String descriptionName, Object[] args) throws ContainerCreateException { + return createSharedObjectContainer(ContainerFactory.getDefault().getDescriptionByName(descriptionName), args); } }
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java index 2b9e45183..24c0c6cfa 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java @@ -8,15 +8,10 @@ ******************************************************************************/ package org.eclipse.ecf.core.sharedobject; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; - +import java.util.*; import org.eclipse.ecf.core.sharedobject.provider.ISharedObjectInstantiator; import org.eclipse.ecf.core.util.Trace; -import org.eclipse.ecf.internal.core.sharedobject.Activator; -import org.eclipse.ecf.internal.core.sharedobject.Messages; -import org.eclipse.ecf.internal.core.sharedobject.SharedObjectDebugOptions; +import org.eclipse.ecf.internal.core.sharedobject.*; /** * Factory for creating {@link ISharedObject} instances. This class provides ECF @@ -33,6 +28,7 @@ public class SharedObjectFactory implements ISharedObjectFactory { } protected SharedObjectFactory() { + // null constructor } public static ISharedObjectFactory getDefault() { @@ -44,9 +40,7 @@ public class SharedObjectFactory implements ISharedObjectFactory { } private static void dumpStack(String msg, Throwable e) { - Trace.catching(Activator.PLUGIN_ID, - SharedObjectDebugOptions.EXCEPTIONS_CATCHING, - SharedObjectFactory.class, "dumpStack", e); //$NON-NLS-1$ + Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, SharedObjectFactory.class, "dumpStack", e); //$NON-NLS-1$ } /* @@ -54,8 +48,7 @@ public class SharedObjectFactory implements ISharedObjectFactory { * * @see org.eclipse.ecf.core.ISharedObjectFactory#addDescription(org.eclipse.ecf.core.SharedObjectTypeDescription) */ - public SharedObjectTypeDescription addDescription( - SharedObjectTypeDescription description) { + public SharedObjectTypeDescription addDescription(SharedObjectTypeDescription description) { trace("addDescription(" + description + ")"); //$NON-NLS-1$ //$NON-NLS-2$ return addDescription0(description); } @@ -73,12 +66,10 @@ public class SharedObjectFactory implements ISharedObjectFactory { return new ArrayList(sharedobjectdescriptions.values()); } - protected SharedObjectTypeDescription addDescription0( - SharedObjectTypeDescription n) { + protected SharedObjectTypeDescription addDescription0(SharedObjectTypeDescription n) { if (n == null) return null; - return (SharedObjectTypeDescription) sharedobjectdescriptions.put(n - .getName(), n); + return (SharedObjectTypeDescription) sharedobjectdescriptions.put(n.getName(), n); } /* @@ -96,12 +87,10 @@ public class SharedObjectFactory implements ISharedObjectFactory { return sharedobjectdescriptions.containsKey(scd.getName()); } - protected SharedObjectTypeDescription getDescription0( - SharedObjectTypeDescription scd) { + protected SharedObjectTypeDescription getDescription0(SharedObjectTypeDescription scd) { if (scd == null) return null; - return (SharedObjectTypeDescription) sharedobjectdescriptions.get(scd - .getName()); + return (SharedObjectTypeDescription) sharedobjectdescriptions.get(scd.getName()); } protected SharedObjectTypeDescription getDescription0(String name) { @@ -115,14 +104,11 @@ public class SharedObjectFactory implements ISharedObjectFactory { * * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#getDescriptionByName(java.lang.String) */ - public SharedObjectTypeDescription getDescriptionByName(String name) - throws SharedObjectCreateException { + public SharedObjectTypeDescription getDescriptionByName(String name) throws SharedObjectCreateException { trace("getDescriptionByName(" + name + ")"); //$NON-NLS-1$ //$NON-NLS-2$ SharedObjectTypeDescription res = getDescription0(name); if (res == null) { - throw new SharedObjectCreateException( - Messages.SharedObjectFactory_Exception_Create_Shared_Object + name - + Messages.SharedObjectFactory_Exception_Create_Shared_Object_Not_Found); + throw new SharedObjectCreateException(Messages.SharedObjectFactory_Exception_Create_Shared_Object + name + Messages.SharedObjectFactory_Exception_Create_Shared_Object_Not_Found); } return res; } @@ -133,33 +119,25 @@ public class SharedObjectFactory implements ISharedObjectFactory { * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObject(org.eclipse.ecf.core.SharedObjectTypeDescription, * java.lang.Object[]) */ - public ISharedObject createSharedObject(SharedObjectTypeDescription desc, - Object[] args) throws SharedObjectCreateException { + public ISharedObject createSharedObject(SharedObjectTypeDescription desc, Object[] args) throws SharedObjectCreateException { trace("createSharedObject(" + desc + "," //$NON-NLS-1$ //$NON-NLS-2$ + Trace.getArgumentsString(args) + ")"); //$NON-NLS-1$ if (desc == null) - throw new SharedObjectCreateException( - Messages.SharedObjectFactory_Description_Not_Null); + throw new SharedObjectCreateException(Messages.SharedObjectFactory_Description_Not_Null); SharedObjectTypeDescription cd = getDescription0(desc); if (cd == null) - throw new SharedObjectCreateException( - Messages.SharedObjectFactory_Exception_Create_Shared_Objec + desc.getName() - + Messages.SharedObjectFactory_Exception_Create_Shared_Object_Not_Found); + throw new SharedObjectCreateException(Messages.SharedObjectFactory_Exception_Create_Shared_Objec + desc.getName() + Messages.SharedObjectFactory_Exception_Create_Shared_Object_Not_Found); ISharedObjectInstantiator instantiator = null; try { instantiator = cd.getInstantiator(); } catch (Exception e) { - SharedObjectCreateException newexcept = new SharedObjectCreateException( - Messages.SharedObjectFactory_Exception_Create_With_Description + desc - + ": " + e.getClass().getName() + ": " //$NON-NLS-1$ //$NON-NLS-2$ - + e.getMessage(), e); + SharedObjectCreateException newexcept = new SharedObjectCreateException(Messages.SharedObjectFactory_Exception_Create_With_Description + desc + ": " + e.getClass().getName() + ": " //$NON-NLS-1$ //$NON-NLS-2$ + + e.getMessage(), e); dumpStack("Exception in createSharedObject", newexcept); //$NON-NLS-1$ throw newexcept; } if (instantiator == null) - throw new SharedObjectCreateException( - Messages.SharedObjectFactory_Exception_Create_Instantiator + cd.getName() - + Messages.SharedObjectFactory_Exception_Create_Instantiator_Null); + throw new SharedObjectCreateException(Messages.SharedObjectFactory_Exception_Create_Instantiator + cd.getName() + Messages.SharedObjectFactory_Exception_Create_Instantiator_Null); // Ask instantiator to actually create instance return instantiator.createInstance(desc, args); } @@ -169,8 +147,7 @@ public class SharedObjectFactory implements ISharedObjectFactory { * * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObject(java.lang.String) */ - public ISharedObject createSharedObject(String descriptionName) - throws SharedObjectCreateException { + public ISharedObject createSharedObject(String descriptionName) throws SharedObjectCreateException { return createSharedObject(getDescriptionByName(descriptionName), null); } @@ -180,8 +157,7 @@ public class SharedObjectFactory implements ISharedObjectFactory { * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObject(java.lang.String, * java.lang.Object[]) */ - public ISharedObject createSharedObject(String descriptionName, - Object[] args) throws SharedObjectCreateException { + public ISharedObject createSharedObject(String descriptionName, Object[] args) throws SharedObjectCreateException { return createSharedObject(getDescriptionByName(descriptionName), args); } @@ -190,17 +166,14 @@ public class SharedObjectFactory implements ISharedObjectFactory { * * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#removeDescription(org.eclipse.ecf.core.SharedObjectTypeDescription) */ - public SharedObjectTypeDescription removeDescription( - SharedObjectTypeDescription scd) { + public SharedObjectTypeDescription removeDescription(SharedObjectTypeDescription scd) { trace("removeDescription(" + scd + ")"); //$NON-NLS-1$ //$NON-NLS-2$ return removeDescription0(scd); } - protected SharedObjectTypeDescription removeDescription0( - SharedObjectTypeDescription n) { + protected SharedObjectTypeDescription removeDescription0(SharedObjectTypeDescription n) { if (n == null) return null; - return (SharedObjectTypeDescription) sharedobjectdescriptions.remove(n - .getName()); + return (SharedObjectTypeDescription) sharedobjectdescriptions.remove(n.getName()); } }
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java index 403fd5177..06a182afc 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java @@ -13,11 +13,8 @@ package org.eclipse.ecf.core.sharedobject; import java.io.NotSerializableException; import java.io.Serializable; import java.lang.reflect.Method; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; +import java.security.*; import java.util.Arrays; - import org.eclipse.ecf.internal.core.sharedobject.Messages; /** @@ -33,14 +30,13 @@ public class SharedObjectMsg implements Serializable { public static final Class[] nullTypes = new Class[0]; protected SharedObjectMsg() { + // null constructor } // Static factory methods for creating SharedObjectMsg instances - public static SharedObjectMsg createMsg(String className, - String methodName, Object[] param) { + public static SharedObjectMsg createMsg(String className, String methodName, Object[] param) { if (methodName == null || param == null) { - throw new NullPointerException( - Messages.SharedObjectMsg_Excepton_Invalid_Shared_Object_Msg); + throw new NullPointerException(Messages.SharedObjectMsg_Excepton_Invalid_Shared_Object_Msg); } return new SharedObjectMsg(className, methodName, param); } @@ -57,9 +53,8 @@ public class SharedObjectMsg implements Serializable { return createMsg(className, methodName, nullArgs); } - public static SharedObjectMsg createMsg(String className, - String methodName, Object arg) { - Object args[] = { arg }; + public static SharedObjectMsg createMsg(String className, String methodName, Object arg) { + Object args[] = {arg}; return createMsg(className, methodName, args); } @@ -67,29 +62,23 @@ public class SharedObjectMsg implements Serializable { return createMsg((String) null, methodName, arg); } - public static SharedObjectMsg createMsg(String className, - String methodName, Object arg1, Object arg2) { - Object args[] = { arg1, arg2 }; + public static SharedObjectMsg createMsg(String className, String methodName, Object arg1, Object arg2) { + Object args[] = {arg1, arg2}; return createMsg(className, methodName, args); } - public static SharedObjectMsg createMsg(String className, - String methodName, Object arg1, Object arg2, Object arg3) { - Object args[] = { arg1, arg2, arg3 }; + public static SharedObjectMsg createMsg(String className, String methodName, Object arg1, Object arg2, Object arg3) { + Object args[] = {arg1, arg2, arg3}; return createMsg(className, methodName, args); } - public static SharedObjectMsg createMsg(String className, - String methodName, Object arg1, Object arg2, Object arg3, - Object arg4) { - Object args[] = { arg1, arg2, arg3, arg4 }; + public static SharedObjectMsg createMsg(String className, String methodName, Object arg1, Object arg2, Object arg3, Object arg4) { + Object args[] = {arg1, arg2, arg3, arg4}; return createMsg(className, methodName, args); } - public static SharedObjectMsg createMsg(String className, - String methodName, Object arg1, Object arg2, Object arg3, - Object arg4, Object arg5) { - Object args[] = { arg1, arg2, arg3, arg4, arg5 }; + public static SharedObjectMsg createMsg(String className, String methodName, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) { + Object args[] = {arg1, arg2, arg3, arg4, arg5}; return createMsg(className, methodName, args); } @@ -106,8 +95,7 @@ public class SharedObjectMsg implements Serializable { * @exception ClassNotFoundException * thrown if specified class is not found */ - public static Class getClass(ClassLoader loader, String name) - throws ClassNotFoundException { + public static Class getClass(ClassLoader loader, String name) throws ClassNotFoundException { if (name == null) return null; return Class.forName(name, true, loader); @@ -162,24 +150,21 @@ public class SharedObjectMsg implements Serializable { * call * @return Method instance found on given class. Null if none found. */ - public static Method findMethod(final Class clazz, String meth, - Class args[]) { + public static Method findMethod(final Class clazz, String meth, Class args[]) { Method methods[] = null; try { - methods = (Method[]) AccessController - .doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws Exception { - return clazz.getDeclaredMethods(); - } - }); + methods = (Method[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { + public Object run() throws Exception { + return clazz.getDeclaredMethods(); + } + }); } catch (PrivilegedActionException e) { return null; } return searchForMethod(methods, meth, args); } - public static Method searchForMethod(Method meths[], String meth, - Class args[]) { + public static Method searchForMethod(Method meths[], String meth, Class args[]) { // Find it from among the given set of Method objects for (int i = 0; i < meths.length; i++) { Method test = meths[i]; @@ -204,18 +189,15 @@ public class SharedObjectMsg implements Serializable { * method for execution * @return Method instance if found, null if not found */ - public static Method findMethodRecursive(Class clazz, String meth, - Class args[]) { + public static Method findMethodRecursive(Class clazz, String meth, Class args[]) { Method aMethod = findMethod(clazz, meth, args); if (aMethod == null) { Class superclazz = clazz.getSuperclass(); if (superclazz != null) return findMethodRecursive(superclazz, meth, args); - else - return null; - } else { - return aMethod; + return null; } + return aMethod; } /** @@ -228,13 +210,11 @@ public class SharedObjectMsg implements Serializable { * thrown if any objects in args array do not implement * java.io.Serializable */ - public static void checkForSerializable(SharedObjectMsg aMsg) - throws NotSerializableException { + public static void checkForSerializable(SharedObjectMsg aMsg) throws NotSerializableException { Object args[] = aMsg.getParameters(); for (int i = 0; i < args.length; i++) { if (args[i] != null && !(args[i] instanceof Serializable)) - throw new NotSerializableException(Messages.SharedObjectMsg_Exception_Param + i - + Messages.SharedObjectMsg_Exception_Not_Serializable); + throw new NotSerializableException(Messages.SharedObjectMsg_Exception_Param + i + Messages.SharedObjectMsg_Exception_Not_Serializable); } } @@ -255,8 +235,7 @@ public class SharedObjectMsg implements Serializable { protected Object[] parameters; // Constructor - protected SharedObjectMsg(String className, String methodName, - Object[] parameters) { + protected SharedObjectMsg(String className, String methodName, Object[] parameters) { this.clazz = className; this.method = methodName; this.parameters = parameters; @@ -304,12 +283,12 @@ public class SharedObjectMsg implements Serializable { return getTypesForParameters(getParameters()); } - protected final Method findMethod(Class clazz) { - return findMethod(clazz, getMethod(), getParameterTypes()); + protected final Method findMethod(Class clazz1) { + return findMethod(clazz1, getMethod(), getParameterTypes()); } - protected final Method findMethodRecursive(Class clazz) { - return findMethodRecursive(clazz, getMethod(), getParameterTypes()); + protected final Method findMethodRecursive(Class clazz1) { + return findMethodRecursive(clazz1, getMethod(), getParameterTypes()); } public final Object invoke(Object target) throws Exception { @@ -328,8 +307,7 @@ public class SharedObjectMsg implements Serializable { } else { // If it is specified, then load the specified class, using the // target object's classloader - meth = findMethod(getClass(target.getClass().getClassLoader(), - clazz)); + meth = findMethod(getClass(target.getClass().getClassLoader(), clazz)); } // If no method was found, then throw if (meth == null) diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java index 418e579e1..87816e694 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java @@ -10,25 +10,13 @@ *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Vector; - +import java.util.*; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; import org.eclipse.ecf.core.identity.ID; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCommitEvent; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; -import org.eclipse.ecf.core.sharedobject.events.SharedObjectCommitEvent; -import org.eclipse.ecf.core.util.Event; -import org.eclipse.ecf.core.util.IEventProcessor; -import org.eclipse.ecf.core.util.Trace; -import org.eclipse.ecf.internal.core.sharedobject.Activator; -import org.eclipse.ecf.internal.core.sharedobject.Messages; -import org.eclipse.ecf.internal.core.sharedobject.SharedObjectDebugOptions; +import org.eclipse.ecf.core.sharedobject.events.*; +import org.eclipse.ecf.core.util.*; +import org.eclipse.ecf.internal.core.sharedobject.*; /** * Implementation of two-phase commit for transactional replication of shared @@ -38,8 +26,7 @@ import org.eclipse.ecf.internal.core.sharedobject.SharedObjectDebugOptions; * @see ISharedObjectTransactionParticipantsFilter * */ -public class TwoPhaseCommitEventProcessor implements IEventProcessor, - ISharedObjectContainerTransaction { +public class TwoPhaseCommitEventProcessor implements IEventProcessor, ISharedObjectContainerTransaction { BaseSharedObject sharedObject = null; byte transactionState = ISharedObjectContainerTransaction.ACTIVE; @@ -58,8 +45,7 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, ISharedObjectTransactionParticipantsFilter participantsFilter = null; - public TwoPhaseCommitEventProcessor(BaseSharedObject bse, - ISharedObjectTransactionConfig config) { + public TwoPhaseCommitEventProcessor(BaseSharedObject bse, ISharedObjectTransactionConfig config) { this.sharedObject = bse; if (config == null) { config = new TransactionSharedObjectConfiguration(); @@ -73,10 +59,7 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, } protected void traceStack(String msg, Throwable t) { - Trace.catching(Activator.PLUGIN_ID, - SharedObjectDebugOptions.EXCEPTIONS_CATCHING, - TwoPhaseCommitEventProcessor.class, "traceStack", t); //$NON-NLS-1$ - ; + Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, TwoPhaseCommitEventProcessor.class, "traceStack", t); //$NON-NLS-1$ } protected int getTimeout() { @@ -185,8 +168,7 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, // it to return an ID [] of participants (given // the current group membership if (participantsFilter != null) { - transactionParticipants = participantsFilter - .filterParticipants(groupMembers); + transactionParticipants = participantsFilter.filterParticipants(groupMembers); } // replicate if (transactionParticipants == null) { @@ -217,8 +199,7 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, trace("handleReplicaActivated(" + event + ")"); //$NON-NLS-1$ //$NON-NLS-2$ try { // Try to respond with create success message back to host - getContext().sendCreateResponse(getHomeID(), null, - getNextIdentifier()); + getContext().sendCreateResponse(getHomeID(), null, getNextIdentifier()); // If above succeeds, we're now in prepared state setTransactionState(ISharedObjectContainerTransaction.PREPARED); } catch (Exception except) { @@ -238,7 +219,7 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, synchronized (lock) { // First send replicate message *no matter what state we are // in* - ID[] newMember = new ID[] { event.getTargetID() }; + ID[] newMember = new ID[] {event.getTargetID()}; replicateTo(newMember); addParticipants(newMember); } @@ -285,38 +266,33 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, } } - protected void handleVotingCompletedCreateResponse(ID fromID, Throwable e, - long identifier) { + protected void handleVotingCompletedCreateResponse(ID fromID, Throwable e, long identifier1) { trace("handleVotingCompletedCreateResponse(" + fromID + "," + e + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + identifier + ")"); //$NON-NLS-1$ + + identifier1 + ")"); //$NON-NLS-1$ // If remote creation was successful, simply send commit message back. if (e == null) { try { - getSharedObject().getContext().sendMessage(fromID, - new SharedObjectCommitEvent(getSharedObject().getID())); + getSharedObject().getContext().sendMessage(fromID, new SharedObjectCommitEvent(getSharedObject().getID())); } catch (Exception e2) { traceStack("Exception in sendCommit to " + fromID, e2); //$NON-NLS-1$ } } else { // Too late to vote no - handlePostCommitFailure(fromID, e, identifier); + handlePostCommitFailure(fromID, e, identifier1); } } - protected void handlePostCommitFailure(ID fromID, Throwable e, - long identifier) { + protected void handlePostCommitFailure(ID fromID, Throwable e, long identifier1) { // Do nothing but report - trace("handlePostCommitFailure(" + fromID + "," + e + "," + identifier //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + trace("handlePostCommitFailure(" + fromID + "," + e + "," + identifier1 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ")"); //$NON-NLS-1$ } protected void sendCommit() throws SharedObjectAddAbortException { try { - getContext().sendMessage(null, - new SharedObjectCommitEvent(getSharedObject().getID())); + getContext().sendMessage(null, new SharedObjectCommitEvent(getSharedObject().getID())); } catch (Exception e2) { - doTMAbort(new SharedObjectAddAbortException( - Messages.TwoPhaseCommitEventProcessor_Exception_Shared_Object_Add_Abort, e2, getTimeout())); + doTMAbort(new SharedObjectAddAbortException(Messages.TwoPhaseCommitEventProcessor_Exception_Shared_Object_Add_Abort, e2, getTimeout())); } } @@ -343,10 +319,7 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, trace("waitForFinish waiting " + wait + "ms on " //$NON-NLS-1$ //$NON-NLS-2$ + getSharedObject().getID()); if (wait <= 0L) - throw new SharedObjectAddAbortException( - Messages.TwoPhaseCommitEventProcessor_Exception_Commit_Timeout + getSharedObject().getID() - + Messages.TwoPhaseCommitEventProcessor_Exception_Timeout_Adding_To + getHomeID(), - (Throwable) null, getTimeout()); + throw new SharedObjectAddAbortException(Messages.TwoPhaseCommitEventProcessor_Exception_Commit_Timeout + getSharedObject().getID() + Messages.TwoPhaseCommitEventProcessor_Exception_Timeout_Adding_To + getHomeID(), (Throwable) null, getTimeout()); // Wait right here lock.wait(wait); } @@ -359,8 +332,7 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, } } - protected void doTMAbort(Throwable except) - throws SharedObjectAddAbortException { + protected void doTMAbort(Throwable except) throws SharedObjectAddAbortException { trace("doTMAbort:" + except); //$NON-NLS-1$ // Set our own state variable to ABORTED setTransactionState(ISharedObjectContainerTransaction.ABORTED); @@ -370,9 +342,7 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, // throw so caller gets exception and can deal with it if (except instanceof SharedObjectAddAbortException) throw (SharedObjectAddAbortException) except; - else - throw new SharedObjectAddAbortException(Messages.TwoPhaseCommitEventProcessor_Exception_Shared_Object_Add_Abort, except, - getTimeout()); + throw new SharedObjectAddAbortException(Messages.TwoPhaseCommitEventProcessor_Exception_Shared_Object_Add_Abort, except, getTimeout()); } protected void doTMCommit() throws SharedObjectAddAbortException { @@ -401,12 +371,10 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, // Abort! trace("isVotingCompleted:aborting:failed>" + getMinFailedToAbort() //$NON-NLS-1$ + ":failed=" + failed); //$NON-NLS-1$ - throw new SharedObjectAddAbortException(Messages.TwoPhaseCommitEventProcessor_Exception_Shared_Object_Add_Abort, - participants, failed, getTimeout()); + throw new SharedObjectAddAbortException(Messages.TwoPhaseCommitEventProcessor_Exception_Shared_Object_Add_Abort, participants, failed, getTimeout()); // If no problems, and the number of participants to here from is 0, // then we're done - } else if (getTransactionState() == ISharedObjectContainerTransaction.VOTING - && participants.size() == 0) { + } else if (getTransactionState() == ISharedObjectContainerTransaction.VOTING && participants.size() == 0) { // Success! trace("isVotingCompleted() returning true"); //$NON-NLS-1$ return true; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java index 5a96b43c3..697a1b628 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java @@ -9,4 +9,5 @@ package org.eclipse.ecf.core.sharedobject.events; public interface ISharedObjectCommitEvent extends ISharedObjectEvent { + // no methods } diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java index d980d92e7..bd991b984 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java @@ -16,4 +16,5 @@ package org.eclipse.ecf.core.sharedobject.util; * @see IQueueDequeue */ public interface IQueue extends IQueueDequeue, IQueueEnqueue { + // no methods }
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java index f3b6278ea..d96d36ad3 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java @@ -26,6 +26,10 @@ public class QueueEnqueueImpl implements IQueueEnqueue { * * @see org.eclipse.ecf.core.util.IQueueEnqueue#enqueue(org.eclipse.ecf.core.util.Event) */ + /** + * @param element + * @throws QueueException not thrown by this implementation. + */ public void enqueue(Event element) throws QueueException { queue.enqueue(element); } @@ -48,6 +52,11 @@ public class QueueEnqueueImpl implements IQueueEnqueue { * * @see org.eclipse.ecf.core.util.IQueueEnqueue#enqueue_prepare(org.eclipse.ecf.core.util.Event[]) */ + /** + * @param elements + * @return + * @throws QueueException not thrown by this implementation. + */ public Object enqueue_prepare(Event[] elements) throws QueueException { return elements; } diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java index db39a0caf..7336a07d2 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java @@ -44,14 +44,12 @@ public class SimpleFIFOQueue implements ISimpleFIFOQueue { public synchronized Object peekQueue() { while (isEmpty()) { - if (stopped) { + if (stopped) + return null; + try { + wait(); + } catch (Exception e) { return null; - } else { - try { - wait(); - } catch (Exception e) { - return null; - } } } return list.get(0); @@ -62,17 +60,15 @@ public class SimpleFIFOQueue implements ISimpleFIFOQueue { return peekQueue(); if (stopped) { return null; - } else { - try { - wait(waitMS); - } catch (Exception e) { - return null; - } + } + try { + wait(waitMS); + } catch (Exception e) { + return null; } if (isEmpty()) return null; - else - return list.get(0); + return list.get(0); } public synchronized Object removeHead() { diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/Activator.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/Activator.java index 61a04ddf3..caa38d10f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/Activator.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/Activator.java @@ -2,26 +2,12 @@ package org.eclipse.ecf.internal.core.sharedobject; import java.util.Map; import java.util.Properties; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionDelta; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.IRegistryChangeEvent; -import org.eclipse.core.runtime.IRegistryChangeListener; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.ecf.core.sharedobject.ISharedObjectFactory; -import org.eclipse.ecf.core.sharedobject.SharedObjectFactory; -import org.eclipse.ecf.core.sharedobject.SharedObjectTypeDescription; +import org.eclipse.core.runtime.*; +import org.eclipse.ecf.core.sharedobject.*; import org.eclipse.ecf.core.sharedobject.provider.ISharedObjectInstantiator; import org.eclipse.ecf.core.util.LogHelper; import org.eclipse.ecf.core.util.Trace; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; +import org.osgi.framework.*; import org.osgi.service.log.LogService; import org.osgi.util.tracker.ServiceTracker; @@ -54,7 +40,7 @@ public class Activator implements BundleActivator { // The shared instance private static Activator plugin; - + private BundleContext context = null; private IRegistryChangeListener registryManager = null; @@ -67,6 +53,7 @@ public class Activator implements BundleActivator { * The constructor */ public Activator() { + // null constructor } public IExtensionRegistry getExtensionRegistry() { @@ -78,21 +65,18 @@ public class Activator implements BundleActivator { * * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) */ - public void start(BundleContext context) throws Exception { - this.context = context; + public void start(BundleContext ctxt) throws Exception { + this.context = ctxt; plugin = this; - this.extensionRegistryTracker = new ServiceTracker(context, - IExtensionRegistry.class.getName(), null); + this.extensionRegistryTracker = new ServiceTracker(ctxt, IExtensionRegistry.class.getName(), null); this.extensionRegistryTracker.open(); IExtensionRegistry registry = getExtensionRegistry(); if (registry != null) { this.registryManager = new SharedObjectRegistryManager(); registry.addRegistryChangeListener(registryManager); } - setupSharedObjectExtensionPoint(context); - Trace.exiting(Activator.PLUGIN_ID, - SharedObjectDebugOptions.METHODS_ENTERING, Activator.class, - "start"); //$NON-NLS-1$ + setupSharedObjectExtensionPoint(ctxt); + Trace.exiting(Activator.PLUGIN_ID, SharedObjectDebugOptions.METHODS_ENTERING, Activator.class, "start"); //$NON-NLS-1$ } /* @@ -100,10 +84,8 @@ public class Activator implements BundleActivator { * * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ - public void stop(BundleContext context) throws Exception { - Trace.entering(Activator.PLUGIN_ID, - SharedObjectDebugOptions.METHODS_EXITING, Activator.class, - "stop"); //$NON-NLS-1$ + public void stop(BundleContext ctxt) throws Exception { + Trace.entering(Activator.PLUGIN_ID, SharedObjectDebugOptions.METHODS_EXITING, Activator.class, "stop"); //$NON-NLS-1$ IExtensionRegistry reg = getExtensionRegistry(); if (reg != null) reg.removeRegistryChangeListener(registryManager); @@ -128,14 +110,12 @@ public class Activator implements BundleActivator { public Bundle getBundle() { if (context == null) return null; - else - return context.getBundle(); + return context.getBundle(); } protected LogService getLogService() { if (logServiceTracker == null) { - logServiceTracker = new ServiceTracker(this.context, - LogService.class.getName(), null); + logServiceTracker = new ServiceTracker(this.context, LogService.class.getName(), null); logServiceTracker.open(); } return (LogService) logServiceTracker.getService(); @@ -144,8 +124,7 @@ public class Activator implements BundleActivator { public void log(IStatus status) { LogService logService = getLogService(); if (logService != null) { - logService.log(LogHelper.getLogCode(status), LogHelper - .getLogMessage(status), status.getException()); + logService.log(LogHelper.getLogCode(status), LogHelper.getLogMessage(status), status.getException()); } } @@ -167,29 +146,17 @@ public class Activator implements BundleActivator { if (name == null) continue; ISharedObjectFactory factory = SharedObjectFactory.getDefault(); - SharedObjectTypeDescription sd = factory - .getDescriptionByName(name); + SharedObjectTypeDescription sd = factory.getDescriptionByName(name); if (sd == null || !factory.containsDescription(sd)) { continue; } // remove factory.removeDescription(sd); - org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID, - SharedObjectDebugOptions.DEBUG, - "removeSharedObjectExtensions.removedDescription(" + sd //$NON-NLS-1$ - + ")"); //$NON-NLS-1$ + org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID, SharedObjectDebugOptions.DEBUG, "removeSharedObjectExtensions.removedDescription(" + sd //$NON-NLS-1$ + + ")"); //$NON-NLS-1$ } catch (Exception e) { - org.eclipse.ecf.core.util.Trace.catching( - Activator.PLUGIN_ID, - SharedObjectDebugOptions.EXCEPTIONS_CATCHING, - Activator.class, "removeSharedObjectExtensions", e); //$NON-NLS-1$ - getDefault().log( - new Status( - IStatus.ERROR, - Activator.PLUGIN_ID, - REMOVE_SHAREDOBJECT_ERRORCODE, - Messages.Activator_Exception_Removing_Extension, - e)); + org.eclipse.ecf.core.util.Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, Activator.class, "removeSharedObjectExtensions", e); //$NON-NLS-1$ + getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, REMOVE_SHAREDOBJECT_ERRORCODE, Messages.Activator_Exception_Removing_Extension, e)); } } } @@ -211,8 +178,7 @@ public class Activator implements BundleActivator { String name = null; try { // The only required attribute is "class" - exten = (ISharedObjectInstantiator) member - .createExecutableExtension(CLASS_ATTRIBUTE); + exten = (ISharedObjectInstantiator) member.createExecutableExtension(CLASS_ATTRIBUTE); name = member.getAttribute(NAME_ATTRIBUTE); if (name == null) { name = member.getAttribute(CLASS_ATTRIBUTE); @@ -223,57 +189,29 @@ public class Activator implements BundleActivator { description = ""; //$NON-NLS-1$ } // Get any property elements - Map properties = getProperties(member - .getChildren(PROPERTY_ELEMENT_NAME)); + Map properties = getProperties(member.getChildren(PROPERTY_ELEMENT_NAME)); // Now make description instance - SharedObjectTypeDescription scd = new SharedObjectTypeDescription( - name, exten, description, properties); - org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID, - SharedObjectDebugOptions.DEBUG, - "setupSharedObjectExtensionPoint:createdDescription(" //$NON-NLS-1$ - + scd + ")"); //$NON-NLS-1$ + SharedObjectTypeDescription scd = new SharedObjectTypeDescription(name, exten, description, properties); + org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID, SharedObjectDebugOptions.DEBUG, "setupSharedObjectExtensionPoint:createdDescription(" //$NON-NLS-1$ + + scd + ")"); //$NON-NLS-1$ ISharedObjectFactory factory = SharedObjectFactory.getDefault(); if (factory.containsDescription(scd)) - throw new CoreException( - new Status( - Status.ERROR, - bundleName, - FACTORY_NAME_COLLISION_ERRORCODE, - "name=" //$NON-NLS-1$ - + name - + ";extension point id=" //$NON-NLS-1$ - + extension - .getExtensionPointUniqueIdentifier(), - null)); + throw new CoreException(new Status(IStatus.ERROR, bundleName, FACTORY_NAME_COLLISION_ERRORCODE, "name=" //$NON-NLS-1$ + + name + ";extension point id=" //$NON-NLS-1$ + + extension.getExtensionPointUniqueIdentifier(), null)); // Now add the description and we're ready to go. factory.addDescription(scd); - org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID, - SharedObjectDebugOptions.DEBUG, - "setupSharedObjectExtensionPoint.addedDescriptionToFactory(" //$NON-NLS-1$ - + scd + ")"); //$NON-NLS-1$ + org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID, SharedObjectDebugOptions.DEBUG, "setupSharedObjectExtensionPoint.addedDescriptionToFactory(" //$NON-NLS-1$ + + scd + ")"); //$NON-NLS-1$ } catch (CoreException e) { getDefault().log(e.getStatus()); - org.eclipse.ecf.core.util.Trace.catching( - Activator.PLUGIN_ID, - SharedObjectDebugOptions.EXCEPTIONS_CATCHING, - Activator.class, "addSharedObjectExtensions", e); //$NON-NLS-1$ + org.eclipse.ecf.core.util.Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, Activator.class, "addSharedObjectExtensions", e); //$NON-NLS-1$ } catch (Exception e) { - getDefault().log( - new Status( - Status.ERROR, - bundleName, - FACTORY_NAME_COLLISION_ERRORCODE, - "name=" //$NON-NLS-1$ - + name - + ";extension point id=" //$NON-NLS-1$ - + extension - .getExtensionPointUniqueIdentifier(), - null)); - org.eclipse.ecf.core.util.Trace.catching( - Activator.PLUGIN_ID, - SharedObjectDebugOptions.EXCEPTIONS_CATCHING, - Activator.class, "addSharedObjectExtensions", e); //$NON-NLS-1$ + getDefault().log(new Status(IStatus.ERROR, bundleName, FACTORY_NAME_COLLISION_ERRORCODE, "name=" //$NON-NLS-1$ + + name + ";extension point id=" //$NON-NLS-1$ + + extension.getExtensionPointUniqueIdentifier(), null)); + org.eclipse.ecf.core.util.Trace.catching(Activator.PLUGIN_ID, SharedObjectDebugOptions.EXCEPTIONS_CATCHING, Activator.class, "addSharedObjectExtensions", e); //$NON-NLS-1$ } } } @@ -287,8 +225,7 @@ public class Activator implements BundleActivator { protected void setupSharedObjectExtensionPoint(BundleContext bc) { IExtensionRegistry reg = getExtensionRegistry(); if (reg != null) { - IExtensionPoint extensionPoint = reg - .getExtensionPoint(SHAREDOBJECT_FACTORY_EPOINT); + IExtensionPoint extensionPoint = reg.getExtensionPoint(SHAREDOBJECT_FACTORY_EPOINT); if (extensionPoint == null) { return; } @@ -301,10 +238,8 @@ public class Activator implements BundleActivator { if (propertyElements != null) { if (propertyElements.length > 0) { for (int i = 0; i < propertyElements.length; i++) { - String name = propertyElements[i] - .getAttribute(NAME_ATTRIBUTE); - String value = propertyElements[i] - .getAttribute(VALUE_ATTRIBUTE); + String name = propertyElements[i].getAttribute(NAME_ATTRIBUTE); + String value = propertyElements[i].getAttribute(VALUE_ATTRIBUTE); if (name != null && !name.equals("") && value != null //$NON-NLS-1$ && !value.equals("")) { //$NON-NLS-1$ props.setProperty(name, value); @@ -315,21 +250,17 @@ public class Activator implements BundleActivator { return props; } - protected class SharedObjectRegistryManager implements - IRegistryChangeListener { + protected class SharedObjectRegistryManager implements IRegistryChangeListener { public void registryChanged(IRegistryChangeEvent event) { - IExtensionDelta delta[] = event.getExtensionDeltas(PLUGIN_ID, - NAMESPACE_NAME); + IExtensionDelta delta[] = event.getExtensionDeltas(PLUGIN_ID, NAMESPACE_NAME); for (int i = 0; i < delta.length; i++) { switch (delta[i].getKind()) { - case IExtensionDelta.ADDED: - addSharedObjectExtensions(delta[i].getExtension() - .getConfigurationElements()); - break; - case IExtensionDelta.REMOVED: - removeSharedObjectExtensions(delta[i].getExtension() - .getConfigurationElements()); - break; + case IExtensionDelta.ADDED : + addSharedObjectExtensions(delta[i].getExtension().getConfigurationElements()); + break; + case IExtensionDelta.REMOVED : + removeSharedObjectExtensions(delta[i].getExtension().getConfigurationElements()); + break; } } } diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/Messages.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/Messages.java index f3b1501b3..b1480862a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/Messages.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/Messages.java @@ -38,12 +38,13 @@ public class Messages extends NLS { public static String TwoPhaseCommitEventProcessor_Exception_Commit_Timeout; public static String TwoPhaseCommitEventProcessor_Exception_Shared_Object_Add_Abort; public static String TwoPhaseCommitEventProcessor_Exception_Timeout_Adding_To; - + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); } private Messages() { + // private null constructor } } |